Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,

I fixed this bug: https://bugs.freedesktop.org/show_bug.cgi?id=32552
My code is under the LGPLv3+/MPL dual license.

Regards,
Balint Dozsa
From 06554f14b1f32b4f8d0020509be59619785ade36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20D=C3=B3zsa?= <dozsabalint@gmail.com>
Date: Thu, 17 Feb 2011 11:19:11 +0100
Subject: [PATCH] Bug 32552 - EasyHack

---
 vcl/unx/source/window/salframe.cxx |   24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index f52f780..9affd50 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -679,7 +679,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD
     nKeyCode_                                  = 0;
     nKeyState_                                 = 0;
     nCompose_                                  = -1;
-    mbKeyMenu                                  = false;
     mbSendExtKeyModChange              = false;
     mnExtKeyMod                                        = 0;
 
@@ -3294,29 +3293,10 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 
         int nRet = CallCallback( SALEVENT_KEYMODCHANGE, &aModEvt );
 
-        // emulate KEY_MENU
-        if ( ( (nKeySym == XK_Alt_L) || (nKeySym == XK_Alt_R) ) &&
-             ( (nModCode & ~(KEY_MOD3|KEY_MOD2)) == 0 ) )
-        {
-            if( pEvent->type == XLIB_KeyPress )
-                mbKeyMenu = true;
-            else if( mbKeyMenu )
-            {
-                // simulate KEY_MENU
-                aKeyEvt.mnCode    = KEY_MENU | nModCode;
-                aKeyEvt.mnRepeat   = 0;
-                aKeyEvt.mnTime    = pEvent->time;
-                aKeyEvt.mnCharCode = 0;
-                nRet = CallCallback( SALEVENT_KEYINPUT, &aKeyEvt );
-                nRet = CallCallback( SALEVENT_KEYUP, &aKeyEvt );
-            }
-        }
-        else
-            mbKeyMenu = false;
         return nRet;
     }
 
-    mbSendExtKeyModChange = mbKeyMenu = false;
+    mbSendExtKeyModChange = false;
 
     // try to figure out the vcl code for the keysym
     // #i52338# use the unmodified KeySym if there is none for the real KeySym
@@ -3515,7 +3495,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
         else
         {
             mbInputFocus = False;
-            mbSendExtKeyModChange = mbKeyMenu = false;
+            mbSendExtKeyModChange = false;
             mnExtKeyMod = 0;
             return CallCallback( SALEVENT_LOSEFOCUS, 0 );
         }
-- 
1.7.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.