summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/app
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/app')
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx35
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx46
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx23
-rw-r--r--vcl/unx/generic/app/i18n_keysym.cxx1
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx25
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx4
-rw-r--r--vcl/unx/generic/app/saldata.cxx2
-rw-r--r--vcl/unx/generic/app/saldisp.cxx3
-rw-r--r--vcl/unx/generic/app/salinst.cxx5
-rw-r--r--vcl/unx/generic/app/saltimer.cxx1
-rw-r--r--vcl/unx/generic/app/sm.cxx4
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx3
12 files changed, 0 insertions, 152 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index ac62b621275d..015f226ed8fb 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <string.h>
@@ -38,12 +37,8 @@
#include "unx/i18n_im.hxx"
#include "salframe.hxx"
-
-
// i. preedit start callback
-
-
int
PreeditStartCallback ( XIC, XPointer client_data, XPointer )
{
@@ -58,12 +53,8 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer )
return -1;
}
-
-
// ii. preedit done callback
-
-
void
PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
{
@@ -76,17 +67,11 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
pPreeditData->eState = ePreeditStatusStartPending;
}
-
-
// iii. preedit draw callback
-
-
-
// Handle deletion of text in a preedit_draw_callback
// from and howmuch are guaranteed to be nonnegative
-
void
Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch)
{
@@ -148,11 +133,9 @@ enlarge_buffer ( preedit_text_t *ptext, int nnewlimit )
nnewsize * sizeof(XIMFeedback));
}
-
// Handle insertion of text in a preedit_draw_callback
// string field of XIMText struct is guaranteed to be != NULL
-
void
Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
{
@@ -241,7 +224,6 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
pText->pUnicodeBuffer[pText->nLength] = (sal_Unicode)0;
}
-
// Handle the change of attributes in a preedit_draw_callback
void
@@ -376,7 +358,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
}
}
-
// build the SalExtTextInputEvent and send it up
pPreeditData->aInputEv.mnTime = 0;
@@ -423,12 +404,8 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
return;
}
-
-
// iv. preedit caret callback
-
-
#if OSL_DEBUG_LEVEL > 1
void
PreeditCaretCallback ( XIC ic, XPointer client_data,
@@ -472,13 +449,9 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* )
#endif
}
-
-
// v. commit string callback: convert an extended text input (iiimp ... )
// into an ordinary key-event
-
-
Bool
IsControlCode(sal_Unicode nChar)
{
@@ -488,12 +461,8 @@ IsControlCode(sal_Unicode nChar)
return False;
}
-
-
// vi. status callbacks: for now these are empty, they are just needed for turbo linux
-
-
void
StatusStartCallback (XIC, XPointer, XPointer)
{
@@ -557,12 +526,8 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data)
::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
}
-
-
// vii. destroy callbacks: internally disable all IC/IM calls
-
-
void
IC_IMDestroyCallback (XIM, XPointer client_data, XPointer)
{
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 4430caaef58b..8c429d50ac39 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <sal/alloca.h>
@@ -56,13 +55,9 @@ static void sendEmptyCommit( SalFrame* pFrame )
pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
}
-
-
// Constructor / Destructor, the InputContext is bound to the SalFrame, as it
// needs the shell window as a focus window
-
-
SalI18N_InputContext::~SalI18N_InputContext()
{
if ( maContext != NULL )
@@ -80,10 +75,8 @@ SalI18N_InputContext::~SalI18N_InputContext()
free(maClientData.aText.pCharStyle);
}
-
// convenience routine to add items to a XVaNestedList
-
static XVaNestedList
XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
{
@@ -111,10 +104,8 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
return a_dstlist != NULL ? a_dstlist : a_srclist ;
}
-
// convenience routine to create a fontset
-
static XFontSet
get_font_set( Display *p_display )
{
@@ -133,12 +124,8 @@ get_font_set( Display *p_display )
return p_font_set;
}
-
-
// Constructor for a InputContext (IC)
-
-
SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
mbUseable( True ),
maContext( (XIC)NULL ),
@@ -196,10 +183,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maClientData.aText.nCursorPos = 0;
maClientData.aText.nLength = 0;
-
// Status attributes
-
switch ( mnStatusStyle )
{
case XIMStatusCallbacks:
@@ -236,10 +221,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
break;
}
-
// set preedit attributes
-
switch ( mnPreeditStyle )
{
case XIMPreeditCallbacks:
@@ -373,13 +356,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
}
}
-
-
// In Solaris 8 the status window does not unmap if the frame unmapps, so
// unmap it the hard way
-
-
void
SalI18N_InputContext::Unmap( SalFrame* pFrame )
{
@@ -419,13 +398,9 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
}
}
-
-
// Handle DestroyCallbacks
// in fact this is a callback called from the XNDestroyCallback
-
-
void
SalI18N_InputContext::HandleDestroyIM()
{
@@ -433,13 +408,9 @@ SalI18N_InputContext::HandleDestroyIM()
mbUseable = False;
}
-
-
// make sure, the input method gets all the X-Events it needs, this is only
// called once on each frame, it relys on a valid maContext
-
-
void
SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
{
@@ -460,12 +431,8 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
}
}
-
-
// tune the styles provided by the input method with the supported one
-
-
unsigned int
SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const
{
@@ -547,12 +514,8 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ;
}
-
-
// handle extended and normal key input
-
-
int
SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
{
@@ -603,14 +566,10 @@ SalI18N_InputContext::UpdateSpotLocation()
return 0;
}
-
-
// set and unset the focus for the Input Context
// the context may be NULL despite it is useable if the framewindow is
// in unmapped state
-
-
void
SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
{
@@ -655,12 +614,8 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
}
}
-
-
// multi byte input method only
-
-
void
SalI18N_InputContext::SetLanguage(LanguageType)
{
@@ -689,5 +644,4 @@ SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ )
}
}
-
/* 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 04c88e0c8deb..e08ea6aae38b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <string.h>
@@ -48,13 +47,9 @@ using namespace vcl;
extern "C" char * XSetIMValues(XIM im, ...);
#endif
-
-
// kinput2 IME needs special key handling since key release events are filtered in
// preeditmode and XmbResetIC does not work
-
-
bool
IMServerKinput2 ()
{
@@ -143,12 +138,8 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const
&& same_screen == rEvent.same_screen;
}
-
-
// locale handling
-
-
// Locale handling of the operating system layer
static char*
@@ -262,12 +253,8 @@ SalI18N_InputMethod::PosixLocale()
return False;
}
-
-
// Constructor / Destructor / Initialisation
-
-
SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ),
maMethod( (XIM)NULL ),
mpStyles( (XIMStyles*)NULL )
@@ -286,11 +273,9 @@ SalI18N_InputMethod::~SalI18N_InputMethod()
XCloseIM ( maMethod );
}
-
// XXX
// debug routine: lets have a look at the provided method styles
-
#if OSL_DEBUG_LEVEL > 1
extern "C" char*
@@ -352,11 +337,9 @@ PrintInputStyle( XIMStyles *pStyle )
#endif
-
// this is the real constructing routine, since locale setting has to be done
// prior to xopendisplay, the xopenim call has to be delayed
-
bool
SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
{
@@ -401,10 +384,8 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
return mbUseable;
}
-
// give IM the opportunity to look at the event, and possibly hide it
-
bool
SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window )
{
@@ -446,8 +427,6 @@ SalI18N_InputMethod::HandleDestroyIM()
maMethod = NULL;
}
-
-
// add a connection watch into the SalXLib yieldTable to allow iiimp
// connection processing: soffice waits in select() not in XNextEvent(), so
// there may be requests pending on the iiimp internal connection that will
@@ -455,8 +434,6 @@ SalI18N_InputMethod::HandleDestroyIM()
// have the focus because the atok12 lookup choice aux window has it we stay
// deaf and dump otherwise.
-
-
int
InputMethod_HasPendingEvent(int nFileDescriptor, void *pData)
{
diff --git a/vcl/unx/generic/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx
index a720658335a2..2ce0e08ef439 100644
--- a/vcl/unx/generic/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <X11/X.h>
#include <sal/types.h>
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index b6b2bbd8e08c..b5a286a46c96 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
@@ -75,8 +74,6 @@ void StatusWindow::setPosition( SalFrame* )
{
}
-
-
namespace vcl {
class XIMStatusWindow : public StatusWindow
@@ -301,8 +298,6 @@ OUString XIMStatusWindow::getText() const
return m_aStatusText.GetText();
}
-
-
namespace vcl {
class IIIMPStatusWindow : public StatusWindow
@@ -470,8 +465,6 @@ void IIIMPStatusWindow::GetFocus()
}
}
-
-
IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn )
{
if( pBtn == & m_aStatusBtn )
@@ -516,31 +509,23 @@ I18NStatus& I18NStatus::get()
return *pInstance;
}
-
-
bool I18NStatus::exists()
{
return pInstance != NULL;
}
-
-
void I18NStatus::free()
{
if( pInstance )
delete pInstance, pInstance = NULL;
}
-
-
I18NStatus::I18NStatus() :
m_pParent( NULL ),
m_pStatusWindow( NULL )
{
}
-
-
I18NStatus::~I18NStatus()
{
if( m_pStatusWindow )
@@ -549,8 +534,6 @@ I18NStatus::~I18NStatus()
pInstance = NULL;
}
-
-
void I18NStatus::setParent( SalFrame* pParent )
{
m_pParent = pParent;
@@ -567,8 +550,6 @@ void I18NStatus::setParent( SalFrame* pParent )
m_pStatusWindow->setPosition( m_pParent );
}
-
-
void I18NStatus::show( bool bShow, ShowReason eReason )
{
if( m_pStatusWindow )
@@ -578,8 +559,6 @@ void I18NStatus::show( bool bShow, ShowReason eReason )
}
}
-
-
void I18NStatus::setStatusText( const OUString& rText )
{
if( m_pStatusWindow )
@@ -615,15 +594,11 @@ void I18NStatus::setStatusText( const OUString& rText )
}
}
-
-
void I18NStatus::changeIM( const OUString& rIM )
{
m_aCurrentIM = rIM;
}
-
-
SalFrame* I18NStatus::getStatusFrame() const
{
SalFrame* pRet = NULL;
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index a2d411786c28..27efa557b141 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -52,14 +52,10 @@ namespace vcl_sal {
int nReplacements;
};
-
-
// CAUTION CAUTION CAUTION
// every string value in the replacements tables must be in UTF8
// be careful with your editor !
-
-
static const struct KeysymNameReplacement aImplReplacements_English[] =
{
{ XK_Control_L, "Ctrl" },
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 49933496f349..bcb04d0bcd51 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -316,7 +316,6 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError )
return err;
}
-
void X11SalData::PushXErrorLevel( bool bIgnore )
{
m_aXErrorHandlerStack.push_back( XErrorStackEntry() );
@@ -545,7 +544,6 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent )
)
return;
-
if( pDisplay != GetGenericData()->GetSalDisplay()->GetDisplay() )
return;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 51063cba3ffb..d96fd205fd41 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -81,7 +81,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
using namespace vcl_sal;
-
#define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
#define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
@@ -147,7 +146,6 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
return true;
}
-
extern "C" srv_vendor_t
sal_GetServerVendor( Display *p_display )
{
@@ -2267,7 +2265,6 @@ void SalDisplay::InitXinerama()
#endif
}
-
extern "C"
{
static Bool timestamp_predicate( Display*, XEvent* i_pEvent, XPointer i_pArg )
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 02066a6b074e..fd11d1d1377b 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -77,8 +76,6 @@ X11SalInstance::~X11SalInstance()
GetGenericData()->Dispose();
}
-
-
// AnyInput from sv/mow/source/app/svapp.cxx
struct PredicateReturn
@@ -235,8 +232,6 @@ static void getServerDirectories( std::list< OString >& o_rFontPaths )
#endif
}
-
-
void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths )
{
Display *pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay();
diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx
index c337510daafe..19b44955cfe0 100644
--- a/vcl/unx/generic/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <sys/time.h>
#include <sys/times.h>
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 223bdef545f0..51a1bc392bef 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -165,7 +165,6 @@ static SmProp** ppSmProps = NULL;
static int nSmProps = 0;
static unsigned char *pSmRestartHint = NULL;
-
static void BuildSmPropertyList()
{
if( ! pSmProps )
@@ -413,7 +412,6 @@ void SessionManagerClient::saveDone()
}
}
-
void SessionManagerClient::open(SalSession * pSession)
{
assert(!m_pSession && !m_pICEConnectionObserver && !m_pSmcConnection);
@@ -527,7 +525,6 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown )
}
}
-
OUString SessionManagerClient::getExecName()
{
OUString aExec, aSysExec;
@@ -539,7 +536,6 @@ OUString SessionManagerClient::getExecName()
return aSysExec;
}
-
OString SessionManagerClient::getPreviousSessionID()
{
OString aPrevId;
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index a89e21a42cf1..787bb3c7162c 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -98,7 +97,6 @@ struct WMAdaptorProtocol
int nProtocol;
};
-
/*
* table must be sorted ascending in strings
* since it is use with bsearch
@@ -218,7 +216,6 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay )
return pAdaptor;
}
-
/*
* WMAdaptor constructor
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 08:22:48 +0000