include/postx.h | 8 --------
vcl/unx/generic/app/i18n_im.cxx | 8 ++++----
vcl/unx/generic/app/saldisp.cxx | 6 +++---
vcl/unx/generic/app/salinst.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.cxx | 10 +++++-----
vcl/unx/generic/window/salframe.cxx | 8 ++++----
vcl/unx/kde4/KDESalDisplay.cxx | 2 +-
7 files changed, 18 insertions(+), 26 deletions(-)
New commits:
commit 544c4fc14bca0e670ed1d59569f22c5d4a643c72
Author: Noel Grandin <n...@peralex.com>
Date: Wed Oct 1 08:13:30 2014 +0200
fdo#82577: Handle KeyPress
It appears that this became unnecessary at some point
Change-Id: Iee7c09d00f8dee79f51f0a93b8f5f16137c9c626
diff --git a/include/postx.h b/include/postx.h
index ec0b826..36cf120 100644
--- a/include/postx.h
+++ b/include/postx.h
@@ -37,14 +37,6 @@
#undef InitializeToken
#undef NextRequest
-#ifdef KeyPress
-#if KeyPress != 2
-Error KeyPress must be Equal 2
-#endif
-#undef KeyPress
-#endif
-#define XLIB_KeyPress 2
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 0cd33d2..795df40 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -108,8 +108,8 @@ XKeyEventOp::erase ()
bool
XKeyEventOp::match (const XKeyEvent &rEvent) const
{
- return ( (type == XLIB_KeyPress && rEvent.type == KeyRelease)
- || (type == KeyRelease && rEvent.type == XLIB_KeyPress ))
+ return ( (type == KeyPress && rEvent.type == KeyRelease)
+ || (type == KeyRelease && rEvent.type == KeyPress ))
/* && serial == rEvent.serial */
&& send_event == rEvent.send_event
&& display == rEvent.display
@@ -385,7 +385,7 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window
window )
bool bFilterEvent = XFilterEvent (pEvent, window);
- if (pEvent->type != XLIB_KeyPress && pEvent->type != KeyRelease)
+ if (pEvent->type != KeyPress && pEvent->type != KeyRelease)
return bFilterEvent;
/*
@@ -402,7 +402,7 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window
window )
}
else /* (!bFilterEvent) */
{
- if (pKeyEvent->type == XLIB_KeyPress)
+ if (pKeyEvent->type == KeyPress)
maLastKeyPress = *pKeyEvent;
else
maLastKeyPress.erase();
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index cd556c6..85d3997 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1887,7 +1887,7 @@ void SalX11Display::Yield()
bool SalX11Display::Dispatch( XEvent *pEvent )
{
- if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease )
+ if( pEvent->type == KeyPress || pEvent->type == KeyRelease )
{
::Window aWindow = pEvent->xkey.window;
@@ -1950,7 +1950,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
case ButtonRelease:
m_nLastUserEventTime = pEvent->xbutton.time;
break;
- case XLIB_KeyPress:
+ case KeyPress:
case KeyRelease:
m_nLastUserEventTime = pEvent->xkey.time;
break;
@@ -2044,7 +2044,7 @@ void SalDisplay::DbgPrintDisplayEvent(const char
*pComment, XEvent *pEvent) cons
switch( pEvent->type )
{
- case XLIB_KeyPress:
+ case KeyPress:
case KeyRelease:
fprintf( stderr, "\t\ts=%d c=%d\n",
pEvent->xkey.state,
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index fd11d1d..0845ddc 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -104,7 +104,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char
*pData )
nType = VCL_INPUT_MOUSE;
break;
- case XLIB_KeyPress:
+ case KeyPress:
//case KeyRelease:
nType = VCL_INPUT_KEYBOARD;
break;
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 22dbdb7..d9a3838 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -2538,7 +2538,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
case ButtonRelease:
fprintf( stderr, "handleDragEvent: ButtonRelease %d (m_nDragButton
= %d)\n", rMessage.xbutton.button, m_nDragButton );
break;
- case XLIB_KeyPress:
+ case KeyPress:
fprintf( stderr, "handleDragEvent: KeyPress\n" );
break;
case KeyRelease:
@@ -2639,7 +2639,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
sendDropPosition( bForce, rMessage.type == MotionNotify ?
rMessage.xmotion.time : rMessage.xcrossing.time );
}
}
- else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
+ else if( rMessage.type == KeyPress || rMessage.type == KeyRelease )
{
bHandled = true;
KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode,
0, 0 );
@@ -2696,7 +2696,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
case XK_Control_L: nNewState = ControlMask;break;
// just interested in shift and ctrl for dnd
}
- if( rMessage.type == XLIB_KeyPress )
+ if( rMessage.type == KeyPress )
nState |= nNewState;
else
nState &= ~nNewState;
@@ -3600,7 +3600,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
case MotionNotify:
case ButtonPress:
case ButtonRelease:
- case XLIB_KeyPress:
+ case KeyPress:
case KeyRelease:
bHandled = handleDragEvent( rEvent );
break;
@@ -3783,7 +3783,7 @@ sal_Bool SelectionManager::handleEvent(const Any& event)
Time nTimestamp = CurrentTime;
if( pEvent->type == ButtonPress || pEvent->type == ButtonRelease )
nTimestamp = pEvent->xbutton.time;
- else if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease )
+ else if( pEvent->type == KeyPress || pEvent->type == KeyRelease )
nTimestamp = pEvent->xkey.time;
else if( pEvent->type == MotionNotify )
nTimestamp = pEvent->xmotion.time;
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0e11e9a..0bda729 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3148,7 +3148,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
{
SalKeyModEvent aModEvt;
aModEvt.mnModKeyCode = 0;
- if( pEvent->type == XLIB_KeyPress && mnExtKeyMod == 0 )
+ if( pEvent->type == KeyPress && mnExtKeyMod == 0 )
mbSendExtKeyModChange = true;
else if( pEvent->type == KeyRelease && mbSendExtKeyModChange )
{
@@ -3246,7 +3246,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
vcl::DeletionListener aDeleteWatch( this );
- if( nModCode == (KEY_SHIFT | KEY_MOD1) && pEvent->type == XLIB_KeyPress )
+ if( nModCode == (KEY_SHIFT | KEY_MOD1) && pEvent->type == KeyPress )
{
sal_uInt16 nSeqKeyCode = pDisplay_->GetKeyCode( nUnmodifiedKeySym,
&aDummy );
if( nSeqKeyCode == KEY_U )
@@ -3969,7 +3969,7 @@ Bool X11SalFrame::checkKeyReleaseForRepeat( Display*,
XEvent* pCheck, XPointer p
{
X11SalFrame* pThis = (X11SalFrame*)pX11SalFrame;
return
- pCheck->type == XLIB_KeyPress &&
+ pCheck->type == KeyPress &&
pCheck->xkey.state == pThis->nKeyState_ &&
pCheck->xkey.keycode == pThis->nKeyCode_ &&
pCheck->xkey.time == pThis->nReleaseTime_ ? True : False;
@@ -3992,7 +3992,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
{
switch( pEvent->type )
{
- case XLIB_KeyPress:
+ case KeyPress:
nKeyCode_ = pEvent->xkey.keycode;
nKeyState_ = pEvent->xkey.state;
nRet = HandleKeyEvent( &pEvent->xkey );
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 4c268b1..06e7b6d 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -76,7 +76,7 @@ void SalKDEDisplay::Yield()
// would need this handling).
bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev )
{
- if( ev->xany.type == XLIB_KeyPress || ev->xany.type == KeyRelease
+ if( ev->xany.type == KeyPress || ev->xany.type == KeyRelease
|| ( ev->xany.type == ClientMessage && ev->xclient.message_type ==
xim_protocol ))
{
if( QApplication::activeWindow() == NULL )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
