Skip to content

N
nx-libs
Commit 11d6dac9 authored by Yaakov Selkowitz's avatar Yaakov Selkowitz Committed by Ulrich Sibiller
Browse files
Options

XIM: remove Private and Public macros

Private is a struct member name in mingw-w64 <winioctl.h>, causing this useless define in a private header to break the build. Signed-off-by: 's avatarYaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: 's avatarJon TURNEY <jon.turney@dronecode.org.uk> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 97b9864e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 357 additions and 360 deletions
nx-X11/lib/X11/Ximint.h
View file @ 11d6dac9
...@@ -36,9 +36,6 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -36,9 +36,6 @@ PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h> #include <stdio.h>
#include <nx-X11/Xutil.h> #include <nx-X11/Xutil.h>
#define Public /**/
#define Private static
typedef struct _Xim *Xim; typedef struct _Xim *Xim;
typedef struct _Xic *Xic; typedef struct _Xic *Xic;
...@@ -982,7 +979,7 @@ extern Bool _XimEncodeSavedICATTRIBUTE( ...@@ -982,7 +979,7 @@ extern Bool _XimEncodeSavedICATTRIBUTE(
); );
#endif #endif
extern Public Bool extern Bool
_XimRegisterDispatcher( _XimRegisterDispatcher(
Xim im, Xim im,
Bool (*callback)( Bool (*callback)(
...@@ -990,7 +987,7 @@ _XimRegisterDispatcher( ...@@ -990,7 +987,7 @@ _XimRegisterDispatcher(
), ),
XPointer call_data); XPointer call_data);
extern Public Bool extern Bool
_XimRespSyncReply( _XimRespSyncReply(
Xic ic, Xic ic,
BITMASK16 mode); BITMASK16 mode);
......
nx-X11/lib/X11/imCallbk.c
View file @ 11d6dac9
...@@ -92,17 +92,17 @@ typedef XimCbStatus (*XimCb)( ...@@ -92,17 +92,17 @@ typedef XimCbStatus (*XimCb)(
(im->private.proto.read((im),(XPointer)(buf),(buf_len),&(len))) (im->private.proto.read((im),(XPointer)(buf),(buf_len),&(len)))
#define _XimFlushData(im) im->private.proto.flush((im)) #define _XimFlushData(im) im->private.proto.flush((im))
Private XimCbStatus _XimGeometryCallback(Xim, Xic, char*, int); static XimCbStatus _XimGeometryCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimStrConversionCallback(Xim, Xic, char*, int); static XimCbStatus _XimStrConversionCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimPreeditStartCallback(Xim, Xic, char*, int); static XimCbStatus _XimPreeditStartCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimPreeditDoneCallback(Xim, Xic, char*, int); static XimCbStatus _XimPreeditDoneCallback(Xim, Xic, char*, int);
Private void _free_memory_for_text(XIMText*); static void _free_memory_for_text(XIMText*);
Private XimCbStatus _XimPreeditDrawCallback(Xim, Xic, char*, int); static XimCbStatus _XimPreeditDrawCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimPreeditCaretCallback(Xim, Xic, char*, int); static XimCbStatus _XimPreeditCaretCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimStatusStartCallback(Xim, Xic, char*, int); static XimCbStatus _XimStatusStartCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimStatusDoneCallback(Xim, Xic, char*, int); static XimCbStatus _XimStatusDoneCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimStatusDrawCallback(Xim, Xic, char*, int); static XimCbStatus _XimStatusDrawCallback(Xim, Xic, char*, int);
Private XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int); static XimCbStatus _XimPreeditStateNotifyCallback(Xim, Xic, char *, int);
#if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32)) #if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32))
#define RConst /**/ #define RConst /**/
...@@ -138,13 +138,13 @@ static RConst XimCb callback_table[] = { ...@@ -138,13 +138,13 @@ static RConst XimCb callback_table[] = {
}; };
Private Bool static Bool
_XimIsReadyForProcess(Xic ic) _XimIsReadyForProcess(Xic ic)
{ {
return(!ic->private.proto.waitCallback); /* check HM */ return(!ic->private.proto.waitCallback); /* check HM */
} }
Private void static void
_XimProcessPendingCallbacks(Xic ic) _XimProcessPendingCallbacks(Xic ic)
{ {
XimPendingCallback pcbq; XimPendingCallback pcbq;
...@@ -161,7 +161,7 @@ _XimProcessPendingCallbacks(Xic ic) ...@@ -161,7 +161,7 @@ _XimProcessPendingCallbacks(Xic ic)
} }
} }
Private void static void
_XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data) _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data)
{ {
XimPendingCallback pcbq = ic->private.proto.pend_cb_que; XimPendingCallback pcbq = ic->private.proto.pend_cb_que;
...@@ -182,7 +182,7 @@ _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data) ...@@ -182,7 +182,7 @@ _XimPutCbIntoQueue(Xic ic, XimPendingCallback call_data)
} }
} }
Public Bool Bool
_XimCbDispatch(Xim xim, _XimCbDispatch(Xim xim,
INT16 len, INT16 len,
XPointer data, XPointer data,
...@@ -261,7 +261,7 @@ _XimCbDispatch(Xim xim, ...@@ -261,7 +261,7 @@ _XimCbDispatch(Xim xim,
return True; return True;
} }
Private XimCbStatus static XimCbStatus
_XimGeometryCallback(Xim im, _XimGeometryCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -284,7 +284,7 @@ _XimGeometryCallback(Xim im, ...@@ -284,7 +284,7 @@ _XimGeometryCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimStrConversionCallback(Xim im, _XimStrConversionCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -367,7 +367,7 @@ _XimStrConversionCallback(Xim im, ...@@ -367,7 +367,7 @@ _XimStrConversionCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimPreeditStartCallback(Xim im, _XimPreeditStartCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -416,7 +416,7 @@ _XimPreeditStartCallback(Xim im, ...@@ -416,7 +416,7 @@ _XimPreeditStartCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimPreeditDoneCallback(Xim im, _XimPreeditDoneCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -439,7 +439,7 @@ _XimPreeditDoneCallback(Xim im, ...@@ -439,7 +439,7 @@ _XimPreeditDoneCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private void static void
_read_text_from_packet(Xim im, _read_text_from_packet(Xim im,
char* buf, char* buf,
XIMText** text_ptr) XIMText** text_ptr)
...@@ -554,7 +554,7 @@ _read_text_from_packet(Xim im, ...@@ -554,7 +554,7 @@ _read_text_from_packet(Xim im,
} }
} }
Private void static void
_free_memory_for_text(XIMText* text) _free_memory_for_text(XIMText* text)
{ {
if (text) { if (text) {
...@@ -566,7 +566,7 @@ _free_memory_for_text(XIMText* text) ...@@ -566,7 +566,7 @@ _free_memory_for_text(XIMText* text)
} }
} }
Private XimCbStatus static XimCbStatus
_XimPreeditDrawCallback(Xim im, _XimPreeditDrawCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -597,7 +597,7 @@ _XimPreeditDrawCallback(Xim im, ...@@ -597,7 +597,7 @@ _XimPreeditDrawCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimPreeditCaretCallback(Xim im, _XimPreeditCaretCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -649,7 +649,7 @@ _XimPreeditCaretCallback(Xim im, ...@@ -649,7 +649,7 @@ _XimPreeditCaretCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimStatusStartCallback(Xim im, _XimStatusStartCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -672,7 +672,7 @@ _XimStatusStartCallback(Xim im, ...@@ -672,7 +672,7 @@ _XimStatusStartCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimStatusDoneCallback(Xim im, _XimStatusDoneCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -695,7 +695,7 @@ _XimStatusDoneCallback(Xim im, ...@@ -695,7 +695,7 @@ _XimStatusDoneCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimStatusDrawCallback(Xim im, _XimStatusDrawCallback(Xim im,
Xic ic, Xic ic,
char* proto, char* proto,
...@@ -730,7 +730,7 @@ _XimStatusDrawCallback(Xim im, ...@@ -730,7 +730,7 @@ _XimStatusDrawCallback(Xim im,
return XimCbSuccess; return XimCbSuccess;
} }
Private XimCbStatus static XimCbStatus
_XimPreeditStateNotifyCallback( Xim im, Xic ic, char* proto, int len ) _XimPreeditStateNotifyCallback( Xim im, Xic ic, char* proto, int len )
{ {
XICCallback *cb = &ic->core.preedit_attr.state_notify_callback; XICCallback *cb = &ic->core.preedit_attr.state_notify_callback;
......
nx-X11/lib/X11/imDefFlt.c
View file @ 11d6dac9
...@@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Private long static long
_XimTriggerCheck( _XimTriggerCheck(
Xim im, Xim im,
XKeyEvent *ev, XKeyEvent *ev,
...@@ -66,7 +66,7 @@ _XimTriggerCheck( ...@@ -66,7 +66,7 @@ _XimTriggerCheck(
return -1; return -1;
} }
Private long static long
_XimTriggerOnCheck( _XimTriggerOnCheck(
Xim im, Xim im,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -75,7 +75,7 @@ _XimTriggerOnCheck( ...@@ -75,7 +75,7 @@ _XimTriggerOnCheck(
&im->private.proto.im_onkeylist[1]); &im->private.proto.im_onkeylist[1]);
} }
Private long static long
_XimTriggerOffCheck( _XimTriggerOffCheck(
Xim im, Xim im,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -84,7 +84,7 @@ _XimTriggerOffCheck( ...@@ -84,7 +84,7 @@ _XimTriggerOffCheck(
&im->private.proto.im_offkeylist[1]); &im->private.proto.im_offkeylist[1]);
} }
Private Bool static Bool
_XimOnKeysCheck( _XimOnKeysCheck(
Xic ic, Xic ic,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -103,7 +103,7 @@ _XimOnKeysCheck( ...@@ -103,7 +103,7 @@ _XimOnKeysCheck(
return False; return False;
} }
Private Bool static Bool
_XimOffKeysCheck( _XimOffKeysCheck(
Xic ic, Xic ic,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -122,7 +122,7 @@ _XimOffKeysCheck( ...@@ -122,7 +122,7 @@ _XimOffKeysCheck(
return False; return False;
} }
Private void static void
_XimPendingFilter( _XimPendingFilter(
Xic ic) Xic ic)
{ {
...@@ -135,7 +135,7 @@ _XimPendingFilter( ...@@ -135,7 +135,7 @@ _XimPendingFilter(
return; return;
} }
Private Bool static Bool
_XimProtoKeypressFilter( _XimProtoKeypressFilter(
Xic ic, Xic ic,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -186,7 +186,7 @@ _XimProtoKeypressFilter( ...@@ -186,7 +186,7 @@ _XimProtoKeypressFilter(
return NOTFILTERD; return NOTFILTERD;
} }
Private Bool static Bool
_XimFilterKeypress( _XimFilterKeypress(
Display *d, Display *d,
Window w, Window w,
...@@ -196,7 +196,7 @@ _XimFilterKeypress( ...@@ -196,7 +196,7 @@ _XimFilterKeypress(
return _XimProtoKeypressFilter((Xic)client_data, (XKeyEvent *)ev ); return _XimProtoKeypressFilter((Xic)client_data, (XKeyEvent *)ev );
} }
Private Bool static Bool
_XimProtoKeyreleaseFilter( _XimProtoKeyreleaseFilter(
Xic ic, Xic ic,
XKeyEvent *ev) XKeyEvent *ev)
...@@ -247,7 +247,7 @@ _XimProtoKeyreleaseFilter( ...@@ -247,7 +247,7 @@ _XimProtoKeyreleaseFilter(
return NOTFILTERD; return NOTFILTERD;
} }
Private Bool static Bool
_XimFilterKeyrelease( _XimFilterKeyrelease(
Display *d, Display *d,
Window w, Window w,
...@@ -257,7 +257,7 @@ _XimFilterKeyrelease( ...@@ -257,7 +257,7 @@ _XimFilterKeyrelease(
return _XimProtoKeyreleaseFilter((Xic)client_data, (XKeyEvent *)ev); return _XimProtoKeyreleaseFilter((Xic)client_data, (XKeyEvent *)ev);
} }
Private void static void
_XimRegisterKeyPressFilter( _XimRegisterKeyPressFilter(
Xic ic) Xic ic)
{ {
...@@ -274,7 +274,7 @@ _XimRegisterKeyPressFilter( ...@@ -274,7 +274,7 @@ _XimRegisterKeyPressFilter(
return; return;
} }
Private void static void
_XimRegisterKeyReleaseFilter( _XimRegisterKeyReleaseFilter(
Xic ic) Xic ic)
{ {
...@@ -291,7 +291,7 @@ _XimRegisterKeyReleaseFilter( ...@@ -291,7 +291,7 @@ _XimRegisterKeyReleaseFilter(
return; return;
} }
Private void static void
_XimUnregisterKeyPressFilter( _XimUnregisterKeyPressFilter(
Xic ic) Xic ic)
{ {
...@@ -307,7 +307,7 @@ _XimUnregisterKeyPressFilter( ...@@ -307,7 +307,7 @@ _XimUnregisterKeyPressFilter(
return; return;
} }
Private void static void
_XimUnregisterKeyReleaseFilter( _XimUnregisterKeyReleaseFilter(
Xic ic) Xic ic)
{ {
...@@ -323,7 +323,7 @@ _XimUnregisterKeyReleaseFilter( ...@@ -323,7 +323,7 @@ _XimUnregisterKeyReleaseFilter(
return; return;
} }
Public void void
_XimRegisterFilter( _XimRegisterFilter(
Xic ic) Xic ic)
{ {
...@@ -333,7 +333,7 @@ _XimRegisterFilter( ...@@ -333,7 +333,7 @@ _XimRegisterFilter(
return; return;
} }
Public void void
_XimUnregisterFilter( _XimUnregisterFilter(
Xic ic) Xic ic)
{ {
...@@ -342,7 +342,7 @@ _XimUnregisterFilter( ...@@ -342,7 +342,7 @@ _XimUnregisterFilter(
return; return;
} }
Public void void
_XimReregisterFilter( _XimReregisterFilter(
Xic ic) Xic ic)
{ {
...@@ -354,7 +354,7 @@ _XimReregisterFilter( ...@@ -354,7 +354,7 @@ _XimReregisterFilter(
return; return;
} }
Private Bool static Bool
_XimFilterServerDestroy( _XimFilterServerDestroy(
Display *d, Display *d,
Window w, Window w,
...@@ -376,7 +376,7 @@ _XimFilterServerDestroy( ...@@ -376,7 +376,7 @@ _XimFilterServerDestroy(
return True; return True;
} }
Public void void
_XimRegisterServerFilter( _XimRegisterServerFilter(
Xim im) Xim im)
{ {
...@@ -395,7 +395,7 @@ _XimRegisterServerFilter( ...@@ -395,7 +395,7 @@ _XimRegisterServerFilter(
return; return;
} }
Public void void
_XimUnregisterServerFilter( _XimUnregisterServerFilter(
Xim im) Xim im)
{ {
......
nx-X11/lib/X11/imDefIc.c
View file @ 11d6dac9
...@@ -56,7 +56,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -56,7 +56,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Private Bool static Bool
_XimCreateICCheck( _XimCreateICCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -81,7 +81,7 @@ _XimCreateICCheck( ...@@ -81,7 +81,7 @@ _XimCreateICCheck(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Public Bool Bool
_XimReCreateIC(ic) _XimReCreateIC(ic)
Xic ic; Xic ic;
{ {
...@@ -244,7 +244,7 @@ ErrorOnReCreateIC: ...@@ -244,7 +244,7 @@ ErrorOnReCreateIC:
return False; return False;
} }
Private char * static char *
_XimDelayModeGetICValues(ic, arg) _XimDelayModeGetICValues(ic, arg)
Xic ic; Xic ic;
XIMArg *arg; XIMArg *arg;
...@@ -259,7 +259,7 @@ _XimDelayModeGetICValues(ic, arg) ...@@ -259,7 +259,7 @@ _XimDelayModeGetICValues(ic, arg)
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private Bool static Bool
_XimGetICValuesCheck( _XimGetICValuesCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -288,7 +288,7 @@ _XimGetICValuesCheck( ...@@ -288,7 +288,7 @@ _XimGetICValuesCheck(
return False; return False;
} }
Private char * static char *
_XimProtoGetICValues( _XimProtoGetICValues(
XIC xic, XIC xic,
XIMArg *arg) XIMArg *arg)
...@@ -424,7 +424,7 @@ _XimProtoGetICValues( ...@@ -424,7 +424,7 @@ _XimProtoGetICValues(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private Bool static Bool
_XimCheckNestQuarkList(quark_list, num_quark, quark, separator) _XimCheckNestQuarkList(quark_list, num_quark, quark, separator)
XrmQuark *quark_list; XrmQuark *quark_list;
int num_quark; int num_quark;
...@@ -444,7 +444,7 @@ _XimCheckNestQuarkList(quark_list, num_quark, quark, separator) ...@@ -444,7 +444,7 @@ _XimCheckNestQuarkList(quark_list, num_quark, quark, separator)
return False; return False;
} }
Private Bool static Bool
_XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator) _XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator)
XrmQuark **quark_list; XrmQuark **quark_list;
int idx; int idx;
...@@ -485,7 +485,7 @@ _XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator) ...@@ -485,7 +485,7 @@ _XimCheckNestedQuarkList(quark_list, idx, num_quark, arg, separator)
return True; return True;
} }
Private Bool static Bool
_XimCheckICQuarkList(quark_list, num_quark, quark, idx) _XimCheckICQuarkList(quark_list, num_quark, quark, idx)
XrmQuark *quark_list; XrmQuark *quark_list;
int num_quark; int num_quark;
...@@ -503,7 +503,7 @@ _XimCheckICQuarkList(quark_list, num_quark, quark, idx) ...@@ -503,7 +503,7 @@ _XimCheckICQuarkList(quark_list, num_quark, quark, idx)
return False; return False;
} }
Private Bool static Bool
_XimSaveICValues(ic, arg) _XimSaveICValues(ic, arg)
Xic ic; Xic ic;
XIMArg *arg; XIMArg *arg;
...@@ -610,7 +610,7 @@ _XimSaveICValues(ic, arg) ...@@ -610,7 +610,7 @@ _XimSaveICValues(ic, arg)
return True; return True;
} }
Private char * static char *
_XimDelayModeSetICValues(ic, arg) _XimDelayModeSetICValues(ic, arg)
Xic ic; Xic ic;
XIMArg *arg; XIMArg *arg;
...@@ -628,7 +628,7 @@ _XimDelayModeSetICValues(ic, arg) ...@@ -628,7 +628,7 @@ _XimDelayModeSetICValues(ic, arg)
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private Bool static Bool
_XimSetICValuesCheck( _XimSetICValuesCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -657,7 +657,7 @@ _XimSetICValuesCheck( ...@@ -657,7 +657,7 @@ _XimSetICValuesCheck(
return False; return False;
} }
Private char * static char *
_XimProtoSetICValues( _XimProtoSetICValues(
XIC xic, XIC xic,
XIMArg *arg) XIMArg *arg)
...@@ -807,7 +807,7 @@ _XimProtoSetICValues( ...@@ -807,7 +807,7 @@ _XimProtoSetICValues(
return name; return name;
} }
Private Bool static Bool
_XimDestroyICCheck( _XimDestroyICCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -837,7 +837,7 @@ _XimDestroyICCheck( ...@@ -837,7 +837,7 @@ _XimDestroyICCheck(
return ret; return ret;
} }
Private void static void
_XimProtoICFree( _XimProtoICFree(
Xic ic) Xic ic)
{ {
...@@ -884,7 +884,7 @@ _XimProtoICFree( ...@@ -884,7 +884,7 @@ _XimProtoICFree(
return; return;
} }
Private void static void
_XimProtoDestroyIC( _XimProtoDestroyIC(
XIC xic) XIC xic)
{ {
...@@ -927,7 +927,7 @@ _XimProtoDestroyIC( ...@@ -927,7 +927,7 @@ _XimProtoDestroyIC(
return; return;
} }
Private void static void
_XimProtoSetFocus( _XimProtoSetFocus(
XIC xic) XIC xic)
{ {
...@@ -972,7 +972,7 @@ _XimProtoSetFocus( ...@@ -972,7 +972,7 @@ _XimProtoSetFocus(
return; return;
} }
Private void static void
_XimProtoUnsetFocus( _XimProtoUnsetFocus(
XIC xic) XIC xic)
{ {
...@@ -1017,7 +1017,7 @@ _XimProtoUnsetFocus( ...@@ -1017,7 +1017,7 @@ _XimProtoUnsetFocus(
return; return;
} }
Private Bool static Bool
_XimResetICCheck( _XimResetICCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -1046,7 +1046,7 @@ _XimResetICCheck( ...@@ -1046,7 +1046,7 @@ _XimResetICCheck(
return False; return False;
} }
Private char * static char *
_XimProtoReset( _XimProtoReset(
XIC xic, XIC xic,
char * (*retfunc) (Xim im, Xic ic, XPointer buf) ) char * (*retfunc) (Xim im, Xic ic, XPointer buf) )
...@@ -1117,7 +1117,7 @@ _XimProtoReset( ...@@ -1117,7 +1117,7 @@ _XimProtoReset(
return commit; return commit;
} }
Private char * static char *
_XimCommitedMbString( _XimCommitedMbString(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -1167,14 +1167,14 @@ Error_On_Reset: ...@@ -1167,14 +1167,14 @@ Error_On_Reset:
return new_commit; return new_commit;
} }
Private char * static char *
_XimProtoMbReset( _XimProtoMbReset(
XIC xic) XIC xic)
{ {
return _XimProtoReset(xic, _XimCommitedMbString); return _XimProtoReset(xic, _XimCommitedMbString);
} }
Private wchar_t * static wchar_t *
_XimCommitedWcString( _XimCommitedWcString(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -1225,7 +1225,7 @@ Error_On_Reset: ...@@ -1225,7 +1225,7 @@ Error_On_Reset:
return new_commit; return new_commit;
} }
Private wchar_t * static wchar_t *
_XimProtoWcReset( _XimProtoWcReset(
XIC xic) XIC xic)
{ {
...@@ -1233,7 +1233,7 @@ _XimProtoWcReset( ...@@ -1233,7 +1233,7 @@ _XimProtoWcReset(
(char * (*) (Xim, Xic, XPointer)) _XimCommitedWcString); (char * (*) (Xim, Xic, XPointer)) _XimCommitedWcString);
} }
Private char * static char *
_XimCommitedUtf8String( _XimCommitedUtf8String(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -1283,14 +1283,14 @@ Error_On_Reset: ...@@ -1283,14 +1283,14 @@ Error_On_Reset:
return new_commit; return new_commit;
} }
Private char * static char *
_XimProtoUtf8Reset( _XimProtoUtf8Reset(
XIC xic) XIC xic)
{ {
return _XimProtoReset(xic, _XimCommitedUtf8String); return _XimProtoReset(xic, _XimCommitedUtf8String);
} }
Private XICMethodsRec ic_methods = { static XICMethodsRec ic_methods = {
_XimProtoDestroyIC, /* destroy */ _XimProtoDestroyIC, /* destroy */
_XimProtoSetFocus, /* set_focus */ _XimProtoSetFocus, /* set_focus */
_XimProtoUnsetFocus, /* unset_focus */ _XimProtoUnsetFocus, /* unset_focus */
...@@ -1304,7 +1304,7 @@ Private XICMethodsRec ic_methods = { ...@@ -1304,7 +1304,7 @@ Private XICMethodsRec ic_methods = {
_XimProtoUtf8LookupString /* utf8_lookup_string */ _XimProtoUtf8LookupString /* utf8_lookup_string */
}; };
Private Bool static Bool
_XimGetInputStyle( _XimGetInputStyle(
XIMArg *arg, XIMArg *arg,
XIMStyle *input_style) XIMStyle *input_style)
...@@ -1321,7 +1321,7 @@ _XimGetInputStyle( ...@@ -1321,7 +1321,7 @@ _XimGetInputStyle(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private Bool static Bool
_XimDelayModeCreateIC( _XimDelayModeCreateIC(
Xic ic, Xic ic,
XIMArg *values, XIMArg *values,
...@@ -1356,7 +1356,7 @@ _XimDelayModeCreateIC( ...@@ -1356,7 +1356,7 @@ _XimDelayModeCreateIC(
return True; return True;
} }
Public Bool Bool
_XimReconnectModeCreateIC(ic) _XimReconnectModeCreateIC(ic)
Xic ic; Xic ic;
{ {
...@@ -1382,7 +1382,7 @@ _XimReconnectModeCreateIC(ic) ...@@ -1382,7 +1382,7 @@ _XimReconnectModeCreateIC(ic)
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Public XIC XIC
_XimProtoCreateIC( _XimProtoCreateIC(
XIM xim, XIM xim,
XIMArg *arg) XIMArg *arg)
......
nx-X11/lib/X11/imDefIm.c
View file @ 11d6dac9
...@@ -63,7 +63,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -63,7 +63,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h" #include "Ximint.h"
Public int int
_XimCheckDataSize( _XimCheckDataSize(
XPointer buf, XPointer buf,
int len) int len)
...@@ -75,7 +75,7 @@ _XimCheckDataSize( ...@@ -75,7 +75,7 @@ _XimCheckDataSize(
return buf_s[1]; return buf_s[1];
} }
Public void void
_XimSetHeader( _XimSetHeader(
XPointer buf, XPointer buf,
CARD8 major_opcode, CARD8 major_opcode,
...@@ -93,7 +93,7 @@ _XimSetHeader( ...@@ -93,7 +93,7 @@ _XimSetHeader(
return; return;
} }
Public char char
_XimGetMyEndian(void) _XimGetMyEndian(void)
{ {
CARD16 test_card = 1; CARD16 test_card = 1;
...@@ -104,7 +104,7 @@ _XimGetMyEndian(void) ...@@ -104,7 +104,7 @@ _XimGetMyEndian(void)
return BIGENDIAN; return BIGENDIAN;
} }
Private Bool static Bool
_XimCheckServerName( _XimCheckServerName(
Xim im, Xim im,
char *str) char *str)
...@@ -142,7 +142,7 @@ _XimCheckServerName( ...@@ -142,7 +142,7 @@ _XimCheckServerName(
return True; return True;
} }
Private char * static char *
_XimCheckLocaleName( _XimCheckLocaleName(
Xim im, Xim im,
char *address, char *address,
...@@ -182,7 +182,7 @@ _XimCheckLocaleName( ...@@ -182,7 +182,7 @@ _XimCheckLocaleName(
return (char *)NULL; return (char *)NULL;
} }
Private Bool static Bool
_XimCheckTransport( _XimCheckTransport(
char *address, char *address,
int address_len, int address_len,
...@@ -226,7 +226,7 @@ _XimCheckTransport( ...@@ -226,7 +226,7 @@ _XimCheckTransport(
return True; return True;
} }
Private Bool static Bool
_CheckSNEvent( _CheckSNEvent(
Display *display, Display *display,
XEvent *xevent, XEvent *xevent,
...@@ -240,7 +240,7 @@ _CheckSNEvent( ...@@ -240,7 +240,7 @@ _CheckSNEvent(
return False; return False;
} }
Private Bool static Bool
_XimGetSelectionNotify( _XimGetSelectionNotify(
Display *display, Display *display,
Window window, Window window,
...@@ -269,7 +269,7 @@ _XimGetSelectionNotify( ...@@ -269,7 +269,7 @@ _XimGetSelectionNotify(
return True; return True;
} }
Private Bool static Bool
_XimPreConnectionIM( _XimPreConnectionIM(
Xim im, Xim im,
Atom selection) Atom selection)
...@@ -387,7 +387,7 @@ Error: ...@@ -387,7 +387,7 @@ Error:
return False; return False;
} }
Private Bool static Bool
_XimPreConnect( _XimPreConnect(
Xim im) Xim im)
{ {
...@@ -434,7 +434,7 @@ _XimPreConnect( ...@@ -434,7 +434,7 @@ _XimPreConnect(
return True; return True;
} }
Private Bool static Bool
_XimGetAuthProtocolNames( _XimGetAuthProtocolNames(
Xim im, Xim im,
CARD16 *buf, CARD16 *buf,
...@@ -452,7 +452,7 @@ _XimGetAuthProtocolNames( ...@@ -452,7 +452,7 @@ _XimGetAuthProtocolNames(
return True; return True;
} }
Private Bool static Bool
_XimSetAuthReplyData( _XimSetAuthReplyData(
Xim im, Xim im,
XPointer buf, XPointer buf,
...@@ -465,7 +465,7 @@ _XimSetAuthReplyData( ...@@ -465,7 +465,7 @@ _XimSetAuthReplyData(
return True; return True;
} }
Private Bool static Bool
_XimSetAuthNextData( _XimSetAuthNextData(
Xim im, Xim im,
XPointer buf, XPointer buf,
...@@ -478,7 +478,7 @@ _XimSetAuthNextData( ...@@ -478,7 +478,7 @@ _XimSetAuthNextData(
return True; return True;
} }
Private Bool static Bool
_XimSetAuthRequiredData( _XimSetAuthRequiredData(
Xim im, Xim im,
XPointer buf, XPointer buf,
...@@ -491,7 +491,7 @@ _XimSetAuthRequiredData( ...@@ -491,7 +491,7 @@ _XimSetAuthRequiredData(
return True; return True;
} }
Private Bool static Bool
_XimCheckAuthSetupData( _XimCheckAuthSetupData(
Xim im, Xim im,
XPointer buf) XPointer buf)
...@@ -502,7 +502,7 @@ _XimCheckAuthSetupData( ...@@ -502,7 +502,7 @@ _XimCheckAuthSetupData(
return True; return True;
} }
Private Bool static Bool
_XimCheckAuthNextData( _XimCheckAuthNextData(
Xim im, Xim im,
XPointer buf) XPointer buf)
...@@ -517,7 +517,7 @@ _XimCheckAuthNextData( ...@@ -517,7 +517,7 @@ _XimCheckAuthNextData(
#define GOOD_AUTH 1 #define GOOD_AUTH 1
#define BAD_AUTH 0 #define BAD_AUTH 0
Private int static int
_XimClientAuthCheck( _XimClientAuthCheck(
Xim im, Xim im,
XPointer buf) XPointer buf)
...@@ -528,7 +528,7 @@ _XimClientAuthCheck( ...@@ -528,7 +528,7 @@ _XimClientAuthCheck(
return NO_MORE_AUTH; return NO_MORE_AUTH;
} }
Private void static void
_XimAuthNG( _XimAuthNG(
Xim im) Xim im)
{ {
...@@ -542,7 +542,7 @@ _XimAuthNG( ...@@ -542,7 +542,7 @@ _XimAuthNG(
return; return;
} }
Private Bool static Bool
_XimAllRecv( _XimAllRecv(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -555,7 +555,7 @@ _XimAllRecv( ...@@ -555,7 +555,7 @@ _XimAllRecv(
#define CLIENT_WAIT1 1 #define CLIENT_WAIT1 1
#define CLIENT_WAIT2 2 #define CLIENT_WAIT2 2
Private Bool static Bool
_XimConnection( _XimConnection(
Xim im) Xim im)
{ {
...@@ -716,7 +716,7 @@ _XimConnection( ...@@ -716,7 +716,7 @@ _XimConnection(
return True; return True;
} }
Private Bool static Bool
_XimDisconnectCheck( _XimDisconnectCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -735,7 +735,7 @@ _XimDisconnectCheck( ...@@ -735,7 +735,7 @@ _XimDisconnectCheck(
return False; return False;
} }
Private Bool static Bool
_XimDisconnect( _XimDisconnect(
Xim im) Xim im)
{ {
...@@ -775,7 +775,7 @@ _XimDisconnect( ...@@ -775,7 +775,7 @@ _XimDisconnect(
return True; return True;
} }
Private Bool static Bool
_XimOpenCheck( _XimOpenCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -794,7 +794,7 @@ _XimOpenCheck( ...@@ -794,7 +794,7 @@ _XimOpenCheck(
return False; return False;
} }
Private Bool static Bool
_XimOpen( _XimOpen(
Xim im) Xim im)
{ {
...@@ -890,7 +890,7 @@ _XimOpen( ...@@ -890,7 +890,7 @@ _XimOpen(
return True; return True;
} }
Private Bool static Bool
_XimCloseCheck( _XimCloseCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -914,7 +914,7 @@ _XimCloseCheck( ...@@ -914,7 +914,7 @@ _XimCloseCheck(
return False; return False;
} }
Private Bool static Bool
_XimClose( _XimClose(
Xim im) Xim im)
{ {
...@@ -972,7 +972,7 @@ _XimClose( ...@@ -972,7 +972,7 @@ _XimClose(
return True; return True;
} }
Public void void
_XimProtoIMFree( _XimProtoIMFree(
Xim im) Xim im)
{ {
...@@ -1090,7 +1090,7 @@ _XimProtoIMFree( ...@@ -1090,7 +1090,7 @@ _XimProtoIMFree(
return; return;
} }
Private Status static Status
_XimProtoCloseIM( _XimProtoCloseIM(
XIM xim) XIM xim)
{ {
...@@ -1138,7 +1138,7 @@ _XimProtoCloseIM( ...@@ -1138,7 +1138,7 @@ _XimProtoCloseIM(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private Bool static Bool
_XimCheckIMQuarkList( _XimCheckIMQuarkList(
XrmQuark *quark_list, XrmQuark *quark_list,
int num_quark, int num_quark,
...@@ -1154,7 +1154,7 @@ _XimCheckIMQuarkList( ...@@ -1154,7 +1154,7 @@ _XimCheckIMQuarkList(
return False; return False;
} }
Private Bool static Bool
_XimSaveIMValues( _XimSaveIMValues(
Xim im, Xim im,
XIMArg *arg) XIMArg *arg)
...@@ -1203,7 +1203,7 @@ _XimSaveIMValues( ...@@ -1203,7 +1203,7 @@ _XimSaveIMValues(
return True; return True;
} }
Private char * static char *
_XimDelayModeSetIMValues( _XimDelayModeSetIMValues(
Xim im, Xim im,
XIMArg *arg) XIMArg *arg)
...@@ -1221,7 +1221,7 @@ _XimDelayModeSetIMValues( ...@@ -1221,7 +1221,7 @@ _XimDelayModeSetIMValues(
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private Bool static Bool
_XimSetIMValuesCheck( _XimSetIMValuesCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -1245,7 +1245,7 @@ _XimSetIMValuesCheck( ...@@ -1245,7 +1245,7 @@ _XimSetIMValuesCheck(
return False; return False;
} }
Private char * static char *
_XimProtoSetIMValues( _XimProtoSetIMValues(
XIM xim, XIM xim,
XIMArg *arg) XIMArg *arg)
...@@ -1377,7 +1377,7 @@ _XimProtoSetIMValues( ...@@ -1377,7 +1377,7 @@ _XimProtoSetIMValues(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private char * static char *
_XimDelayModeGetIMValues( _XimDelayModeGetIMValues(
Xim im, Xim im,
XIMArg *arg) XIMArg *arg)
...@@ -1390,7 +1390,7 @@ _XimDelayModeGetIMValues( ...@@ -1390,7 +1390,7 @@ _XimDelayModeGetIMValues(
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private Bool static Bool
_XimGetIMValuesCheck( _XimGetIMValuesCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -1414,7 +1414,7 @@ _XimGetIMValuesCheck( ...@@ -1414,7 +1414,7 @@ _XimGetIMValuesCheck(
return False; return False;
} }
Private char * static char *
_XimProtoGetIMValues( _XimProtoGetIMValues(
XIM xim, XIM xim,
XIMArg *arg) XIMArg *arg)
...@@ -1526,7 +1526,7 @@ _XimProtoGetIMValues( ...@@ -1526,7 +1526,7 @@ _XimProtoGetIMValues(
return makeid_name; return makeid_name;
} }
Private XIMMethodsRec im_methods = { static XIMMethodsRec im_methods = {
_XimProtoCloseIM, /* close */ _XimProtoCloseIM, /* close */
_XimProtoSetIMValues, /* set_values */ _XimProtoSetIMValues, /* set_values */
_XimProtoGetIMValues, /* get_values */ _XimProtoGetIMValues, /* get_values */
...@@ -1536,7 +1536,7 @@ Private XIMMethodsRec im_methods = { ...@@ -1536,7 +1536,7 @@ Private XIMMethodsRec im_methods = {
_Ximctstoutf8 /* ctstoutf8 */ _Ximctstoutf8 /* ctstoutf8 */
}; };
Private Bool static Bool
_XimSetEncodingByName( _XimSetEncodingByName(
Xim im, Xim im,
char **buf, char **buf,
...@@ -1569,7 +1569,7 @@ _XimSetEncodingByName( ...@@ -1569,7 +1569,7 @@ _XimSetEncodingByName(
return True; return True;
} }
Private Bool static Bool
_XimSetEncodingByDetail( _XimSetEncodingByDetail(
Xim im, Xim im,
char **buf, char **buf,
...@@ -1580,7 +1580,7 @@ _XimSetEncodingByDetail( ...@@ -1580,7 +1580,7 @@ _XimSetEncodingByDetail(
return True; return True;
} }
Private Bool static Bool
_XimGetEncoding( _XimGetEncoding(
Xim im, Xim im,
CARD16 *buf, CARD16 *buf,
...@@ -1669,7 +1669,7 @@ _XimGetEncoding( ...@@ -1669,7 +1669,7 @@ _XimGetEncoding(
return True; return True;
} }
Private Bool static Bool
_XimEncodingNegoCheck( _XimEncodingNegoCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -1693,7 +1693,7 @@ _XimEncodingNegoCheck( ...@@ -1693,7 +1693,7 @@ _XimEncodingNegoCheck(
return False; return False;
} }
Private Bool static Bool
_XimEncodingNegotiation( _XimEncodingNegotiation(
Xim im) Xim im)
{ {
...@@ -1799,7 +1799,7 @@ free_name_ptr: ...@@ -1799,7 +1799,7 @@ free_name_ptr:
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private Bool static Bool
_XimSendSavedIMValues( _XimSendSavedIMValues(
Xim im) Xim im)
{ {
...@@ -1909,7 +1909,7 @@ _XimSendSavedIMValues( ...@@ -1909,7 +1909,7 @@ _XimSendSavedIMValues(
return True; return True;
} }
Private void static void
_XimDelayModeIMFree( _XimDelayModeIMFree(
Xim im) Xim im)
{ {
...@@ -1932,7 +1932,7 @@ _XimDelayModeIMFree( ...@@ -1932,7 +1932,7 @@ _XimDelayModeIMFree(
return; return;
} }
Public Bool Bool
_XimConnectServer( _XimConnectServer(
Xim im) Xim im)
{ {
...@@ -1956,7 +1956,7 @@ _XimConnectServer( ...@@ -1956,7 +1956,7 @@ _XimConnectServer(
return False; return False;
} }
Public Bool Bool
_XimDelayModeSetAttr( _XimDelayModeSetAttr(
Xim im) Xim im)
{ {
...@@ -1988,7 +1988,7 @@ _XimDelayModeSetAttr( ...@@ -1988,7 +1988,7 @@ _XimDelayModeSetAttr(
return True; return True;
} }
Private Bool static Bool
_XimReconnectModeSetAttr( _XimReconnectModeSetAttr(
Xim im) Xim im)
{ {
...@@ -2015,7 +2015,7 @@ _XimReconnectModeSetAttr( ...@@ -2015,7 +2015,7 @@ _XimReconnectModeSetAttr(
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Public Bool Bool
_XimProtoOpenIM( _XimProtoOpenIM(
Xim im) Xim im)
{ {
......
nx-X11/lib/X11/imDefLkup.c
View file @ 11d6dac9
...@@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Public Xic Xic
_XimICOfXICID( _XimICOfXICID(
Xim im, Xim im,
XICID icid) XICID icid)
...@@ -48,7 +48,7 @@ _XimICOfXICID( ...@@ -48,7 +48,7 @@ _XimICOfXICID(
return (Xic)0; return (Xic)0;
} }
Private void static void
_XimProcIMSetEventMask( _XimProcIMSetEventMask(
Xim im, Xim im,
XPointer buf) XPointer buf)
...@@ -60,7 +60,7 @@ _XimProcIMSetEventMask( ...@@ -60,7 +60,7 @@ _XimProcIMSetEventMask(
return; return;
} }
Private void static void
_XimProcICSetEventMask( _XimProcICSetEventMask(
Xic ic, Xic ic,
XPointer buf) XPointer buf)
...@@ -73,7 +73,7 @@ _XimProcICSetEventMask( ...@@ -73,7 +73,7 @@ _XimProcICSetEventMask(
return; return;
} }
Public Bool Bool
_XimSetEventMaskCallback( _XimSetEventMaskCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -98,7 +98,7 @@ _XimSetEventMaskCallback( ...@@ -98,7 +98,7 @@ _XimSetEventMaskCallback(
return False; return False;
} }
Private Bool static Bool
_XimSyncCheck( _XimSyncCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -127,7 +127,7 @@ _XimSyncCheck( ...@@ -127,7 +127,7 @@ _XimSyncCheck(
return False; return False;
} }
Public Bool Bool
_XimSync( _XimSync(
Xim im, Xim im,
Xic ic) Xic ic)
...@@ -185,7 +185,7 @@ _XimSync( ...@@ -185,7 +185,7 @@ _XimSync(
return True; return True;
} }
Public Bool Bool
_XimProcSyncReply( _XimProcSyncReply(
Xim im, Xim im,
Xic ic) Xic ic)
...@@ -208,7 +208,7 @@ _XimProcSyncReply( ...@@ -208,7 +208,7 @@ _XimProcSyncReply(
return True; return True;
} }
Public Bool Bool
_XimRespSyncReply( _XimRespSyncReply(
Xic ic, Xic ic,
BITMASK16 mode) BITMASK16 mode)
...@@ -219,7 +219,7 @@ _XimRespSyncReply( ...@@ -219,7 +219,7 @@ _XimRespSyncReply(
return True; return True;
} }
Public Bool Bool
_XimSyncCallback( _XimSyncCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -240,7 +240,7 @@ _XimSyncCallback( ...@@ -240,7 +240,7 @@ _XimSyncCallback(
return False; return False;
} }
Private INT16 static INT16
_XimSetEventToWire( _XimSetEventToWire(
XEvent *ev, XEvent *ev,
xEvent *event) xEvent *event)
...@@ -252,7 +252,7 @@ _XimSetEventToWire( ...@@ -252,7 +252,7 @@ _XimSetEventToWire(
return sz_xEvent; return sz_xEvent;
} }
Private Bool static Bool
_XimForwardEventCore( _XimForwardEventCore(
Xic ic, Xic ic,
XEvent *ev, XEvent *ev,
...@@ -324,7 +324,7 @@ _XimForwardEventCore( ...@@ -324,7 +324,7 @@ _XimForwardEventCore(
return True; return True;
} }
Public Bool Bool
_XimForwardEvent( _XimForwardEvent(
Xic ic, Xic ic,
XEvent *ev, XEvent *ev,
...@@ -338,7 +338,7 @@ _XimForwardEvent( ...@@ -338,7 +338,7 @@ _XimForwardEvent(
return _XimForwardEventCore(ic, ev, sync); return _XimForwardEventCore(ic, ev, sync);
} }
Private void static void
_XimProcEvent( _XimProcEvent(
Display *d, Display *d,
Xic ic, Xic ic,
...@@ -356,7 +356,7 @@ _XimProcEvent( ...@@ -356,7 +356,7 @@ _XimProcEvent(
return; return;
} }
Private Bool static Bool
_XimForwardEventRecv( _XimForwardEventRecv(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -375,7 +375,7 @@ _XimForwardEventRecv( ...@@ -375,7 +375,7 @@ _XimForwardEventRecv(
return True; return True;
} }
Public Bool Bool
_XimForwardEventCallback( _XimForwardEventCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -396,7 +396,7 @@ _XimForwardEventCallback( ...@@ -396,7 +396,7 @@ _XimForwardEventCallback(
return False; return False;
} }
Private Bool static Bool
_XimRegisterTriggerkey( _XimRegisterTriggerkey(
Xim im, Xim im,
XPointer buf) XPointer buf)
...@@ -443,7 +443,7 @@ _XimRegisterTriggerkey( ...@@ -443,7 +443,7 @@ _XimRegisterTriggerkey(
return True; return True;
} }
Public Bool Bool
_XimRegisterTriggerKeysCallback( _XimRegisterTriggerKeysCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -457,7 +457,7 @@ _XimRegisterTriggerKeysCallback( ...@@ -457,7 +457,7 @@ _XimRegisterTriggerKeysCallback(
return True; return True;
} }
Public EVENTMASK EVENTMASK
_XimGetWindowEventmask( _XimGetWindowEventmask(
Xic ic) Xic ic)
{ {
...@@ -470,7 +470,7 @@ _XimGetWindowEventmask( ...@@ -470,7 +470,7 @@ _XimGetWindowEventmask(
} }
Private Bool static Bool
_XimTriggerNotifyCheck( _XimTriggerNotifyCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -499,7 +499,7 @@ _XimTriggerNotifyCheck( ...@@ -499,7 +499,7 @@ _XimTriggerNotifyCheck(
return False; return False;
} }
Public Bool Bool
_XimTriggerNotify( _XimTriggerNotify(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -567,7 +567,7 @@ _XimTriggerNotify( ...@@ -567,7 +567,7 @@ _XimTriggerNotify(
return True; return True;
} }
Private Bool static Bool
_XimRegCommitInfo( _XimRegCommitInfo(
Xic ic, Xic ic,
char *string, char *string,
...@@ -588,7 +588,7 @@ _XimRegCommitInfo( ...@@ -588,7 +588,7 @@ _XimRegCommitInfo(
return True; return True;
} }
Private void static void
_XimUnregCommitInfo( _XimUnregCommitInfo(
Xic ic) Xic ic)
{ {
...@@ -606,7 +606,7 @@ _XimUnregCommitInfo( ...@@ -606,7 +606,7 @@ _XimUnregCommitInfo(
return; return;
} }
Public void void
_XimFreeCommitInfo( _XimFreeCommitInfo(
Xic ic) Xic ic)
{ {
...@@ -615,7 +615,7 @@ _XimFreeCommitInfo( ...@@ -615,7 +615,7 @@ _XimFreeCommitInfo(
return; return;
} }
Private Bool static Bool
_XimProcKeySym( _XimProcKeySym(
Xic ic, Xic ic,
CARD32 sym, CARD32 sym,
...@@ -635,7 +635,7 @@ _XimProcKeySym( ...@@ -635,7 +635,7 @@ _XimProcKeySym(
return True; return True;
} }
Private Bool static Bool
_XimProcCommit( _XimProcCommit(
Xic ic, Xic ic,
BYTE *buf, BYTE *buf,
...@@ -659,7 +659,7 @@ _XimProcCommit( ...@@ -659,7 +659,7 @@ _XimProcCommit(
return True; return True;
} }
Private Bool static Bool
_XimCommitRecv( _XimCommitRecv(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -718,7 +718,7 @@ _XimCommitRecv( ...@@ -718,7 +718,7 @@ _XimCommitRecv(
return True; return True;
} }
Public Bool Bool
_XimCommitCallback( _XimCommitCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -739,7 +739,7 @@ _XimCommitCallback( ...@@ -739,7 +739,7 @@ _XimCommitCallback(
return False; return False;
} }
Public void void
_XimProcError( _XimProcError(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -748,7 +748,7 @@ _XimProcError( ...@@ -748,7 +748,7 @@ _XimProcError(
return; return;
} }
Public Bool Bool
_XimErrorCallback( _XimErrorCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -777,7 +777,7 @@ _XimErrorCallback( ...@@ -777,7 +777,7 @@ _XimErrorCallback(
return True; return True;
} }
Public Bool Bool
_XimError( _XimError(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -821,7 +821,7 @@ _XimError( ...@@ -821,7 +821,7 @@ _XimError(
return True; return True;
} }
Private int static int
_Ximctsconvert( _Ximctsconvert(
XlcConv conv, XlcConv conv,
char *from, char *from,
...@@ -887,7 +887,7 @@ _Ximctsconvert( ...@@ -887,7 +887,7 @@ _Ximctsconvert(
return to_cnvlen; return to_cnvlen;
} }
Public int int
_Ximctstombs(XIM xim, char *from, int from_len, _Ximctstombs(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state) char *to, int to_len, Status *state)
{ {
...@@ -895,7 +895,7 @@ _Ximctstombs(XIM xim, char *from, int from_len, ...@@ -895,7 +895,7 @@ _Ximctstombs(XIM xim, char *from, int from_len,
from, from_len, to, to_len, state); from, from_len, to, to_len, state);
} }
Public int int
_Ximctstowcs( _Ximctstowcs(
XIM xim, XIM xim,
char *from, char *from,
...@@ -963,7 +963,7 @@ _Ximctstowcs( ...@@ -963,7 +963,7 @@ _Ximctstowcs(
return to_cnvlen; return to_cnvlen;
} }
Public int int
_Ximctstoutf8( _Ximctstoutf8(
XIM xim, XIM xim,
char *from, char *from,
...@@ -976,7 +976,7 @@ _Ximctstoutf8( ...@@ -976,7 +976,7 @@ _Ximctstoutf8(
from, from_len, to, to_len, state); from, from_len, to, to_len, state);
} }
Public int int
_XimProtoMbLookupString( _XimProtoMbLookupString(
XIC xic, XIC xic,
XKeyEvent *ev, XKeyEvent *ev,
...@@ -1039,7 +1039,7 @@ _XimProtoMbLookupString( ...@@ -1039,7 +1039,7 @@ _XimProtoMbLookupString(
return ret; return ret;
} }
Public int int
_XimProtoWcLookupString( _XimProtoWcLookupString(
XIC xic, XIC xic,
XKeyEvent *ev, XKeyEvent *ev,
...@@ -1102,7 +1102,7 @@ _XimProtoWcLookupString( ...@@ -1102,7 +1102,7 @@ _XimProtoWcLookupString(
return ret; return ret;
} }
Public int int
_XimProtoUtf8LookupString( _XimProtoUtf8LookupString(
XIC xic, XIC xic,
XKeyEvent *ev, XKeyEvent *ev,
......
nx-X11/lib/X11/imDispch.c
View file @ 11d6dac9
...@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h" #include "Ximint.h"
Public Bool Bool
_XimRegProtoIntrCallback( _XimRegProtoIntrCallback(
Xim im, Xim im,
CARD16 major_code, CARD16 major_code,
...@@ -60,7 +60,7 @@ _XimRegProtoIntrCallback( ...@@ -60,7 +60,7 @@ _XimRegProtoIntrCallback(
return True; return True;
} }
Public void void
_XimFreeProtoIntrCallback(Xim im) _XimFreeProtoIntrCallback(Xim im)
{ {
register XimProtoIntrRec *rec, *next; register XimProtoIntrRec *rec, *next;
...@@ -74,7 +74,7 @@ _XimFreeProtoIntrCallback(Xim im) ...@@ -74,7 +74,7 @@ _XimFreeProtoIntrCallback(Xim im)
return; return;
} }
Private Bool static Bool
_XimTransportIntr( _XimTransportIntr(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -95,7 +95,7 @@ _XimTransportIntr( ...@@ -95,7 +95,7 @@ _XimTransportIntr(
return False; return False;
} }
Public Bool Bool
_XimDispatchInit(Xim im) _XimDispatchInit(Xim im)
{ {
if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im)) if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
......
nx-X11/lib/X11/imExten.c
View file @ 11d6dac9
...@@ -55,7 +55,7 @@ typedef struct _XIM_QueryExtRec { ...@@ -55,7 +55,7 @@ typedef struct _XIM_QueryExtRec {
int idx; int idx;
} XIM_QueryExtRec; } XIM_QueryExtRec;
Private XIM_QueryExtRec extensions[] = { static XIM_QueryExtRec extensions[] = {
{False, "XIM_EXT_SET_EVENT_MASK", 0, 0, 0, {False, "XIM_EXT_SET_EVENT_MASK", 0, 0, 0,
XIM_EXT_SET_EVENT_MASK_IDX}, XIM_EXT_SET_EVENT_MASK_IDX},
#ifdef EXT_FORWARD #ifdef EXT_FORWARD
...@@ -68,7 +68,7 @@ Private XIM_QueryExtRec extensions[] = { ...@@ -68,7 +68,7 @@ Private XIM_QueryExtRec extensions[] = {
{False, NULL, 0, 0, 0, 0} /* dummy */ {False, NULL, 0, 0, 0, 0} /* dummy */
}; };
Private int static int
_XimIsSupportExt( _XimIsSupportExt(
int idx) int idx)
{ {
...@@ -86,7 +86,7 @@ _XimIsSupportExt( ...@@ -86,7 +86,7 @@ _XimIsSupportExt(
return -1; return -1;
} }
Private Bool static Bool
_XimProcExtSetEventMask( _XimProcExtSetEventMask(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -113,7 +113,7 @@ _XimProcExtSetEventMask( ...@@ -113,7 +113,7 @@ _XimProcExtSetEventMask(
return True; return True;
} }
Private Bool static Bool
_XimExtSetEventMaskCallback( _XimExtSetEventMaskCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -135,7 +135,7 @@ _XimExtSetEventMaskCallback( ...@@ -135,7 +135,7 @@ _XimExtSetEventMaskCallback(
} }
#ifdef EXT_FORWARD #ifdef EXT_FORWARD
Private Bool static Bool
_XimProcExtForwardKeyEvent( _XimProcExtForwardKeyEvent(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -164,7 +164,7 @@ _XimProcExtForwardKeyEvent( ...@@ -164,7 +164,7 @@ _XimProcExtForwardKeyEvent(
return True; return True;
} }
Private Bool static Bool
_XimExtForwardKeyEventCallback( _XimExtForwardKeyEventCallback(
Xim xim, Xim xim,
INT16 len, INT16 len,
...@@ -185,7 +185,7 @@ _XimExtForwardKeyEventCallback( ...@@ -185,7 +185,7 @@ _XimExtForwardKeyEventCallback(
return False; return False;
} }
Private Bool static Bool
_XimExtForwardKeyEventCheck( _XimExtForwardKeyEventCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -213,7 +213,7 @@ _XimExtForwardKeyEventCheck( ...@@ -213,7 +213,7 @@ _XimExtForwardKeyEventCheck(
return False; return False;
} }
Public Bool Bool
_XimExtForwardKeyEvent( _XimExtForwardKeyEvent(
Xic ic, Xic ic,
XKeyEvent *ev, XKeyEvent *ev,
...@@ -295,7 +295,7 @@ _XimExtForwardKeyEvent( ...@@ -295,7 +295,7 @@ _XimExtForwardKeyEvent(
} }
#endif /* EXT_FORWARD */ #endif /* EXT_FORWARD */
Private int static int
_XimCheckExtensionListSize(void) _XimCheckExtensionListSize(void)
{ {
register int i; register int i;
...@@ -312,7 +312,7 @@ _XimCheckExtensionListSize(void) ...@@ -312,7 +312,7 @@ _XimCheckExtensionListSize(void)
return total; return total;
} }
Private void static void
_XimSetExtensionList( _XimSetExtensionList(
CARD8 *buf) CARD8 *buf)
{ {
...@@ -330,7 +330,7 @@ _XimSetExtensionList( ...@@ -330,7 +330,7 @@ _XimSetExtensionList(
return; return;
} }
Private unsigned int static unsigned int
_XimCountNumberOfExtension( _XimCountNumberOfExtension(
INT16 total, INT16 total,
CARD8 *ext) CARD8 *ext)
...@@ -352,7 +352,7 @@ _XimCountNumberOfExtension( ...@@ -352,7 +352,7 @@ _XimCountNumberOfExtension(
return n; return n;
} }
Private Bool static Bool
_XimParseExtensionList( _XimParseExtensionList(
Xim im, Xim im,
CARD16 *data) CARD16 *data)
...@@ -388,7 +388,7 @@ _XimParseExtensionList( ...@@ -388,7 +388,7 @@ _XimParseExtensionList(
return True; return True;
} }
Private Bool static Bool
_XimQueryExtensionCheck( _XimQueryExtensionCheck(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -412,7 +412,7 @@ _XimQueryExtensionCheck( ...@@ -412,7 +412,7 @@ _XimQueryExtensionCheck(
return False; return False;
} }
Public Bool Bool
_XimExtension( _XimExtension(
Xim im) Xim im)
{ {
...@@ -518,7 +518,7 @@ _XimExtension( ...@@ -518,7 +518,7 @@ _XimExtension(
/* length of XPoint attribute */ /* length of XPoint attribute */
#define XIM_Xpoint_length 12 #define XIM_Xpoint_length 12
Private Bool static Bool
_XimExtMove( _XimExtMove(
Xim im, Xim im,
Xic ic, Xic ic,
...@@ -551,7 +551,7 @@ _XimExtMove( ...@@ -551,7 +551,7 @@ _XimExtMove(
return True; return True;
} }
Public BITMASK32 BITMASK32
_XimExtenArgCheck( _XimExtenArgCheck(
XIMArg *arg) XIMArg *arg)
{ {
...@@ -561,7 +561,7 @@ _XimExtenArgCheck( ...@@ -561,7 +561,7 @@ _XimExtenArgCheck(
return flag; return flag;
} }
Public Bool Bool
_XimExtenMove( _XimExtenMove(
Xim im, Xim im,
Xic ic, Xic ic,
......
nx-X11/lib/X11/imImSw.c
View file @ 11d6dac9
...@@ -40,7 +40,7 @@ THIS SOFTWARE. ...@@ -40,7 +40,7 @@ THIS SOFTWARE.
#include "Ximint.h" #include "Ximint.h"
#include "XimImSw.h" #include "XimImSw.h"
Private Bool static Bool
_XimCheckIfDefault( _XimCheckIfDefault(
Xim im) Xim im)
{ {
......
nx-X11/lib/X11/imInsClbk.c
View file @ 11d6dac9
...@@ -52,11 +52,11 @@ typedef struct _XimInstCallback { ...@@ -52,11 +52,11 @@ typedef struct _XimInstCallback {
} XimInstCallbackRec, *XimInstCallback; } XimInstCallbackRec, *XimInstCallback;
Private XimInstCallback callback_list = NULL; static XimInstCallback callback_list = NULL;
Private Bool lock = False; static Bool lock = False;
Private void static void
MakeLocale( XLCd lcd, char locale[] ) MakeLocale( XLCd lcd, char locale[] )
{ {
char *language, *territory, *codeset; char *language, *territory, *codeset;
...@@ -76,7 +76,7 @@ MakeLocale( XLCd lcd, char locale[] ) ...@@ -76,7 +76,7 @@ MakeLocale( XLCd lcd, char locale[] )
} }
Private Bool static Bool
_XimFilterPropertyNotify( _XimFilterPropertyNotify(
Display *display, Display *display,
Window window, Window window,
...@@ -150,7 +150,7 @@ _XimFilterPropertyNotify( ...@@ -150,7 +150,7 @@ _XimFilterPropertyNotify(
} }
Public Bool Bool
_XimRegisterIMInstantiateCallback( _XimRegisterIMInstantiateCallback(
XLCd lcd, XLCd lcd,
Display *display, Display *display,
...@@ -213,7 +213,7 @@ _XimRegisterIMInstantiateCallback( ...@@ -213,7 +213,7 @@ _XimRegisterIMInstantiateCallback(
} }
Public Bool Bool
_XimUnRegisterIMInstantiateCallback( _XimUnRegisterIMInstantiateCallback(
XLCd lcd, XLCd lcd,
Display *display, Display *display,
...@@ -267,7 +267,7 @@ _XimUnRegisterIMInstantiateCallback( ...@@ -267,7 +267,7 @@ _XimUnRegisterIMInstantiateCallback(
} }
Public void void
_XimResetIMInstantiateCallback(Xim xim) _XimResetIMInstantiateCallback(Xim xim)
{ {
char locale[XIM_MAXLCNAMELEN]; char locale[XIM_MAXLCNAMELEN];
......
nx-X11/lib/X11/imInt.c
View file @ 11d6dac9
...@@ -37,10 +37,10 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -37,10 +37,10 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h" #include "Ximint.h"
#include "XimImSw.h" #include "XimImSw.h"
Private Xim *_XimCurrentIMlist = (Xim *)NULL; static Xim *_XimCurrentIMlist = (Xim *)NULL;
Private int _XimCurrentIMcount = 0; static int _XimCurrentIMcount = 0;
Private Bool static Bool
_XimSetIMStructureList( _XimSetIMStructureList(
Xim im) Xim im)
{ {
...@@ -72,7 +72,7 @@ _XimSetIMStructureList( ...@@ -72,7 +72,7 @@ _XimSetIMStructureList(
return True; return True;
} }
Public void void
_XimDestroyIMStructureList(Xim im) _XimDestroyIMStructureList(Xim im)
{ {
register int i; register int i;
...@@ -86,7 +86,7 @@ _XimDestroyIMStructureList(Xim im) ...@@ -86,7 +86,7 @@ _XimDestroyIMStructureList(Xim im)
return; return;
} }
Public void void
_XimServerDestroy(Xim im_2_destroy) _XimServerDestroy(Xim im_2_destroy)
{ {
register int i; register int i;
...@@ -120,7 +120,7 @@ _XimServerDestroy(Xim im_2_destroy) ...@@ -120,7 +120,7 @@ _XimServerDestroy(Xim im_2_destroy)
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Public void void
_XimServerReconectableDestroy(void) _XimServerReconectableDestroy(void)
{ {
register int i; register int i;
...@@ -147,7 +147,7 @@ _XimServerReconectableDestroy(void) ...@@ -147,7 +147,7 @@ _XimServerReconectableDestroy(void)
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private const char * static const char *
_XimStrstr( _XimStrstr(
register const char *src, register const char *src,
register const char *dest) register const char *dest)
...@@ -163,7 +163,7 @@ _XimStrstr( ...@@ -163,7 +163,7 @@ _XimStrstr(
return NULL; return NULL;
} }
Private char * static char *
_XimMakeImName( _XimMakeImName(
XLCd lcd) XLCd lcd)
{ {
...@@ -193,7 +193,7 @@ _XimMakeImName( ...@@ -193,7 +193,7 @@ _XimMakeImName(
return ret; return ret;
} }
Public XIM XIM
_XimOpenIM( _XimOpenIM(
XLCd lcd, XLCd lcd,
Display *dpy, Display *dpy,
...@@ -251,7 +251,7 @@ Error1: ...@@ -251,7 +251,7 @@ Error1:
return NULL; return NULL;
} }
Public Bool Bool
_XInitIM(XLCd lcd) _XInitIM(XLCd lcd)
{ {
if(lcd == (XLCd)NULL) if(lcd == (XLCd)NULL)
......
nx-X11/lib/X11/imLcGIc.c
View file @ 11d6dac9
...@@ -33,7 +33,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -33,7 +33,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Public char * char *
_XimLocalGetICValues(XIC xic, XIMArg *values) _XimLocalGetICValues(XIC xic, XIMArg *values)
{ {
Xic ic = (Xic)xic; Xic ic = (Xic)xic;
......
nx-X11/lib/X11/imLcIc.c
View file @ 11d6dac9
...@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Private void static void
_XimLocalUnSetFocus( _XimLocalUnSetFocus(
XIC xic) XIC xic)
{ {
...@@ -49,7 +49,7 @@ _XimLocalUnSetFocus( ...@@ -49,7 +49,7 @@ _XimLocalUnSetFocus(
return; return;
} }
Private void static void
_XimLocalDestroyIC( _XimLocalDestroyIC(
XIC xic) XIC xic)
{ {
...@@ -68,7 +68,7 @@ _XimLocalDestroyIC( ...@@ -68,7 +68,7 @@ _XimLocalDestroyIC(
return; return;
} }
Private void static void
_XimLocalSetFocus( _XimLocalSetFocus(
XIC xic) XIC xic)
{ {
...@@ -90,7 +90,7 @@ _XimLocalSetFocus( ...@@ -90,7 +90,7 @@ _XimLocalSetFocus(
return; return;
} }
Private void static void
_XimLocalReset( _XimLocalReset(
XIC xic) XIC xic)
{ {
...@@ -102,7 +102,7 @@ _XimLocalReset( ...@@ -102,7 +102,7 @@ _XimLocalReset(
ic->private.local.brl_committed = 0; ic->private.local.brl_committed = 0;
} }
Private char * static char *
_XimLocalMbReset( _XimLocalMbReset(
XIC xic) XIC xic)
{ {
...@@ -110,7 +110,7 @@ _XimLocalMbReset( ...@@ -110,7 +110,7 @@ _XimLocalMbReset(
return (char *)NULL; return (char *)NULL;
} }
Private wchar_t * static wchar_t *
_XimLocalWcReset( _XimLocalWcReset(
XIC xic) XIC xic)
{ {
...@@ -118,7 +118,7 @@ _XimLocalWcReset( ...@@ -118,7 +118,7 @@ _XimLocalWcReset(
return (wchar_t *)NULL; return (wchar_t *)NULL;
} }
Private XICMethodsRec Local_ic_methods = { static XICMethodsRec Local_ic_methods = {
_XimLocalDestroyIC, /* destroy */ _XimLocalDestroyIC, /* destroy */
_XimLocalSetFocus, /* set_focus */ _XimLocalSetFocus, /* set_focus */
_XimLocalUnSetFocus, /* unset_focus */ _XimLocalUnSetFocus, /* unset_focus */
...@@ -132,7 +132,7 @@ Private XICMethodsRec Local_ic_methods = { ...@@ -132,7 +132,7 @@ Private XICMethodsRec Local_ic_methods = {
_XimLocalUtf8LookupString /* utf8_lookup_string */ _XimLocalUtf8LookupString /* utf8_lookup_string */
}; };
Public XIC XIC
_XimLocalCreateIC( _XimLocalCreateIC(
XIM im, XIM im,
XIMArg *values) XIMArg *values)
......
nx-X11/lib/X11/imLcIm.c
View file @ 11d6dac9
...@@ -88,14 +88,14 @@ struct _XimCacheStruct { ...@@ -88,14 +88,14 @@ struct _XimCacheStruct {
/* char encoding[1] */ /* char encoding[1] */
}; };
Private struct _XimCacheStruct* _XimCache_mmap = NULL; static struct _XimCacheStruct* _XimCache_mmap = NULL;
Private DefTreeBase _XimCachedDefaultTreeBase; static DefTreeBase _XimCachedDefaultTreeBase;
Private int _XimCachedDefaultTreeRefcount = 0; static int _XimCachedDefaultTreeRefcount = 0;
#endif #endif
Public Bool Bool
_XimCheckIfLocalProcessing(Xim im) _XimCheckIfLocalProcessing(Xim im)
{ {
FILE *fp; FILE *fp;
...@@ -119,7 +119,7 @@ _XimCheckIfLocalProcessing(Xim im) ...@@ -119,7 +119,7 @@ _XimCheckIfLocalProcessing(Xim im)
return(False); return(False);
} }
Private void static void
XimFreeDefaultTree( XimFreeDefaultTree(
DefTreeBase *b) DefTreeBase *b)
{ {
...@@ -146,7 +146,7 @@ XimFreeDefaultTree( ...@@ -146,7 +146,7 @@ XimFreeDefaultTree(
b->utf8used = b->utf8size = 0; b->utf8used = b->utf8size = 0;
} }
Public void void
_XimLocalIMFree( _XimLocalIMFree(
Xim im) Xim im)
{ {
...@@ -220,7 +220,7 @@ _XimLocalIMFree( ...@@ -220,7 +220,7 @@ _XimLocalIMFree(
return; return;
} }
Private Status static Status
_XimLocalCloseIM( _XimLocalCloseIM(
XIM xim) XIM xim)
{ {
...@@ -241,7 +241,7 @@ _XimLocalCloseIM( ...@@ -241,7 +241,7 @@ _XimLocalCloseIM(
return(True); return(True);
} }
Public char * char *
_XimLocalGetIMValues( _XimLocalGetIMValues(
XIM xim, XIM xim,
XIMArg *values) XIMArg *values)
...@@ -254,7 +254,7 @@ _XimLocalGetIMValues( ...@@ -254,7 +254,7 @@ _XimLocalGetIMValues(
im->core.im_resources, im->core.im_num_resources)); im->core.im_resources, im->core.im_num_resources));
} }
Public char * char *
_XimLocalSetIMValues( _XimLocalSetIMValues(
XIM xim, XIM xim,
XIMArg *values) XIMArg *values)
...@@ -273,7 +273,7 @@ _XimLocalSetIMValues( ...@@ -273,7 +273,7 @@ _XimLocalSetIMValues(
#ifdef COMPOSECACHE #ifdef COMPOSECACHE
Private Bool static Bool
_XimReadCachedDefaultTree( _XimReadCachedDefaultTree(
int fd_cache, int fd_cache,
const char *name, const char *name,
...@@ -324,7 +324,7 @@ _XimReadCachedDefaultTree( ...@@ -324,7 +324,7 @@ _XimReadCachedDefaultTree(
return True; return True;
} }
Private unsigned int strToHash ( static unsigned int strToHash (
const char *name) const char *name)
{ {
unsigned int hash = 0; unsigned int hash = 0;
...@@ -336,7 +336,7 @@ Private unsigned int strToHash ( ...@@ -336,7 +336,7 @@ Private unsigned int strToHash (
/* Returns read-only fd of cache file, -1 if none. /* Returns read-only fd of cache file, -1 if none.
* Sets *res to cache filename if safe. Sets *size to file size of cache. */ * Sets *res to cache filename if safe. Sets *size to file size of cache. */
Private int _XimCachedFileName ( static int _XimCachedFileName (
const char *dir, const char *name, const char *dir, const char *name,
const char *intname, const char *encoding, const char *intname, const char *encoding,
uid_t uid, int isglobal, char **res, off_t *size) uid_t uid, int isglobal, char **res, off_t *size)
...@@ -421,7 +421,7 @@ Private int _XimCachedFileName ( ...@@ -421,7 +421,7 @@ Private int _XimCachedFileName (
} }
Private Bool _XimLoadCache ( static Bool _XimLoadCache (
int fd, int fd,
const char *name, const char *name,
const char *encoding, const char *encoding,
...@@ -441,7 +441,7 @@ Private Bool _XimLoadCache ( ...@@ -441,7 +441,7 @@ Private Bool _XimLoadCache (
} }
Private void static void
_XimWriteCachedDefaultTree( _XimWriteCachedDefaultTree(
const char *name, const char *name,
const char *encoding, const char *encoding,
...@@ -516,7 +516,7 @@ _XimWriteCachedDefaultTree( ...@@ -516,7 +516,7 @@ _XimWriteCachedDefaultTree(
#endif #endif
Private void static void
_XimCreateDefaultTree( _XimCreateDefaultTree(
Xim im) Xim im)
{ {
...@@ -646,7 +646,7 @@ _XimCreateDefaultTree( ...@@ -646,7 +646,7 @@ _XimCreateDefaultTree(
Xfree (cachename); Xfree (cachename);
} }
Private XIMMethodsRec Xim_im_local_methods = { static XIMMethodsRec Xim_im_local_methods = {
_XimLocalCloseIM, /* close */ _XimLocalCloseIM, /* close */
_XimLocalSetIMValues, /* set_values */ _XimLocalSetIMValues, /* set_values */
_XimLocalGetIMValues, /* get_values */ _XimLocalGetIMValues, /* get_values */
...@@ -656,7 +656,7 @@ Private XIMMethodsRec Xim_im_local_methods = { ...@@ -656,7 +656,7 @@ Private XIMMethodsRec Xim_im_local_methods = {
_XimLcctstoutf8 /* ctstoutf8 */ _XimLcctstoutf8 /* ctstoutf8 */
}; };
Public Bool Bool
_XimLocalOpenIM( _XimLocalOpenIM(
Xim im) Xim im)
{ {
......
nx-X11/lib/X11/imLcLkup.c
View file @ 11d6dac9
...@@ -43,7 +43,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -43,7 +43,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "XlcPubI.h" #include "XlcPubI.h"
#include "Ximint.h" #include "Ximint.h"
Public int int
_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
KeySym *keysym, Status *status) KeySym *keysym, Status *status)
{ {
...@@ -130,7 +130,7 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, ...@@ -130,7 +130,7 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
return (ret); return (ret);
} }
Public int int
_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen, _XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
KeySym *keysym, Status *status) KeySym *keysym, Status *status)
{ {
...@@ -202,7 +202,7 @@ _XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen, ...@@ -202,7 +202,7 @@ _XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
return (ret); return (ret);
} }
Public int int
_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
KeySym *keysym, Status *status) KeySym *keysym, Status *status)
{ {
...@@ -275,7 +275,7 @@ _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, ...@@ -275,7 +275,7 @@ _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
return (ret); return (ret);
} }
Private int static int
_XimLcctsconvert( _XimLcctsconvert(
XlcConv conv, XlcConv conv,
char *from, char *from,
...@@ -341,7 +341,7 @@ _XimLcctsconvert( ...@@ -341,7 +341,7 @@ _XimLcctsconvert(
return to_cnvlen; return to_cnvlen;
} }
Public int int
_XimLcctstombs(XIM xim, char *from, int from_len, _XimLcctstombs(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state) char *to, int to_len, Status *state)
{ {
...@@ -349,7 +349,7 @@ _XimLcctstombs(XIM xim, char *from, int from_len, ...@@ -349,7 +349,7 @@ _XimLcctstombs(XIM xim, char *from, int from_len,
from, from_len, to, to_len, state); from, from_len, to, to_len, state);
} }
Public int int
_XimLcctstowcs(XIM xim, char *from, int from_len, _XimLcctstowcs(XIM xim, char *from, int from_len,
wchar_t *to, int to_len, Status *state) wchar_t *to, int to_len, Status *state)
{ {
...@@ -412,7 +412,7 @@ _XimLcctstowcs(XIM xim, char *from, int from_len, ...@@ -412,7 +412,7 @@ _XimLcctstowcs(XIM xim, char *from, int from_len,
return to_cnvlen; return to_cnvlen;
} }
Public int int
_XimLcctstoutf8(XIM xim, char *from, int from_len, _XimLcctstoutf8(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state) char *to, int to_len, Status *state)
{ {
......
nx-X11/lib/X11/imLcSIc.c
View file @ 11d6dac9
...@@ -37,7 +37,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -37,7 +37,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Public char * char *
_XimLocalSetICValues(XIC xic, XIMArg *values) _XimLocalSetICValues(XIC xic, XIMArg *values)
{ {
XimDefICValues ic_values; XimDefICValues ic_values;
......
nx-X11/lib/X11/imRmAttr.c
View file @ 11d6dac9
...@@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -34,7 +34,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h" #include "Ximint.h"
Private XIMResourceList static XIMResourceList
_XimGetNestedListSeparator( _XimGetNestedListSeparator(
XIMResourceList res_list, /* LISTofIMATTR or IMATTR */ XIMResourceList res_list, /* LISTofIMATTR or IMATTR */
unsigned int res_num) unsigned int res_num)
...@@ -42,7 +42,7 @@ _XimGetNestedListSeparator( ...@@ -42,7 +42,7 @@ _XimGetNestedListSeparator(
return _XimGetResourceListRec(res_list, res_num, XNSeparatorofNestedList); return _XimGetResourceListRec(res_list, res_num, XNSeparatorofNestedList);
} }
Private Bool static Bool
_XimCheckInnerIMAttributes( _XimCheckInnerIMAttributes(
Xim im, Xim im,
XIMArg *arg, XIMArg *arg,
...@@ -64,7 +64,7 @@ _XimCheckInnerIMAttributes( ...@@ -64,7 +64,7 @@ _XimCheckInnerIMAttributes(
return True; return True;
} }
Public char * char *
_XimMakeIMAttrIDList( _XimMakeIMAttrIDList(
Xim im, Xim im,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -102,7 +102,7 @@ _XimMakeIMAttrIDList( ...@@ -102,7 +102,7 @@ _XimMakeIMAttrIDList(
return (char *)NULL; return (char *)NULL;
} }
Private Bool static Bool
_XimCheckInnerICAttributes( _XimCheckInnerICAttributes(
Xic ic, Xic ic,
XIMArg *arg, XIMArg *arg,
...@@ -124,7 +124,7 @@ _XimCheckInnerICAttributes( ...@@ -124,7 +124,7 @@ _XimCheckInnerICAttributes(
return True; return True;
} }
Public char * char *
_XimMakeICAttrIDList( _XimMakeICAttrIDList(
Xic ic, Xic ic,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -209,7 +209,7 @@ _XimMakeICAttrIDList( ...@@ -209,7 +209,7 @@ _XimMakeICAttrIDList(
return (char *)NULL; return (char *)NULL;
} }
Private Bool static Bool
_XimAttributeToValue( _XimAttributeToValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -399,7 +399,7 @@ _XimAttributeToValue( ...@@ -399,7 +399,7 @@ _XimAttributeToValue(
return True; return True;
} }
Private Bool static Bool
_XimDecodeInnerIMATTRIBUTE( _XimDecodeInnerIMATTRIBUTE(
Xim im, Xim im,
XIMArg *arg) XIMArg *arg)
...@@ -415,7 +415,7 @@ _XimDecodeInnerIMATTRIBUTE( ...@@ -415,7 +415,7 @@ _XimDecodeInnerIMATTRIBUTE(
return _XimDecodeLocalIMAttr(res, (XPointer)&im_values, arg->value); return _XimDecodeLocalIMAttr(res, (XPointer)&im_values, arg->value);
} }
Public char * char *
_XimDecodeIMATTRIBUTE( _XimDecodeIMATTRIBUTE(
Xim im, Xim im,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -468,7 +468,7 @@ _XimDecodeIMATTRIBUTE( ...@@ -468,7 +468,7 @@ _XimDecodeIMATTRIBUTE(
return (char *)NULL; return (char *)NULL;
} }
Private Bool static Bool
_XimDecodeInnerICATTRIBUTE( _XimDecodeInnerICATTRIBUTE(
Xic ic, Xic ic,
XIMArg *arg, XIMArg *arg,
...@@ -488,7 +488,7 @@ _XimDecodeInnerICATTRIBUTE( ...@@ -488,7 +488,7 @@ _XimDecodeInnerICATTRIBUTE(
return True; return True;
} }
Public char * char *
_XimDecodeICATTRIBUTE( _XimDecodeICATTRIBUTE(
Xic ic, Xic ic,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -564,7 +564,7 @@ _XimDecodeICATTRIBUTE( ...@@ -564,7 +564,7 @@ _XimDecodeICATTRIBUTE(
return (char *)NULL; return (char *)NULL;
} }
Private Bool static Bool
_XimValueToAttribute( _XimValueToAttribute(
XIMResourceList res, XIMResourceList res,
XPointer buf, XPointer buf,
...@@ -772,7 +772,7 @@ _XimValueToAttribute( ...@@ -772,7 +772,7 @@ _XimValueToAttribute(
return True; return True;
} }
Private Bool static Bool
_XimSetInnerIMAttributes( _XimSetInnerIMAttributes(
Xim im, Xim im,
XPointer top, XPointer top,
...@@ -795,7 +795,7 @@ _XimSetInnerIMAttributes( ...@@ -795,7 +795,7 @@ _XimSetInnerIMAttributes(
return _XimEncodeLocalIMAttr(res, top, arg->value); return _XimEncodeLocalIMAttr(res, top, arg->value);
} }
Public char * char *
_XimEncodeIMATTRIBUTE( _XimEncodeIMATTRIBUTE(
Xim im, Xim im,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -859,7 +859,7 @@ _XimEncodeIMATTRIBUTE( ...@@ -859,7 +859,7 @@ _XimEncodeIMATTRIBUTE(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Public Bool Bool
_XimEncodeSavedIMATTRIBUTE( _XimEncodeSavedIMATTRIBUTE(
Xim im, Xim im,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -922,7 +922,7 @@ _XimEncodeSavedIMATTRIBUTE( ...@@ -922,7 +922,7 @@ _XimEncodeSavedIMATTRIBUTE(
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private Bool static Bool
_XimEncodeTopValue( _XimEncodeTopValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -945,7 +945,7 @@ _XimEncodeTopValue( ...@@ -945,7 +945,7 @@ _XimEncodeTopValue(
return True; return True;
} }
Private Bool static Bool
_XimEncodePreeditValue( _XimEncodePreeditValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -996,7 +996,7 @@ _XimEncodePreeditValue( ...@@ -996,7 +996,7 @@ _XimEncodePreeditValue(
return True; return True;
} }
Private Bool static Bool
_XimEncodeStatusValue( _XimEncodeStatusValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -1047,7 +1047,7 @@ _XimEncodeStatusValue( ...@@ -1047,7 +1047,7 @@ _XimEncodeStatusValue(
return True; return True;
} }
Private Bool static Bool
_XimSetInnerICAttributes( _XimSetInnerICAttributes(
Xic ic, Xic ic,
XPointer top, XPointer top,
...@@ -1070,7 +1070,7 @@ _XimSetInnerICAttributes( ...@@ -1070,7 +1070,7 @@ _XimSetInnerICAttributes(
return _XimEncodeLocalICAttr(ic, res, top, arg, mode); return _XimEncodeLocalICAttr(ic, res, top, arg, mode);
} }
Public char * char *
_XimEncodeICATTRIBUTE( _XimEncodeICATTRIBUTE(
Xic ic, Xic ic,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -1182,7 +1182,7 @@ _XimEncodeICATTRIBUTE( ...@@ -1182,7 +1182,7 @@ _XimEncodeICATTRIBUTE(
} }
#ifdef XIM_CONNECTABLE #ifdef XIM_CONNECTABLE
Private Bool static Bool
_XimEncodeSavedPreeditValue( _XimEncodeSavedPreeditValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -1224,7 +1224,7 @@ _XimEncodeSavedPreeditValue( ...@@ -1224,7 +1224,7 @@ _XimEncodeSavedPreeditValue(
return True; return True;
} }
Private Bool static Bool
_XimEncodeSavedStatusValue( _XimEncodeSavedStatusValue(
Xic ic, Xic ic,
XIMResourceList res, XIMResourceList res,
...@@ -1266,7 +1266,7 @@ _XimEncodeSavedStatusValue( ...@@ -1266,7 +1266,7 @@ _XimEncodeSavedStatusValue(
return True; return True;
} }
Public Bool Bool
_XimEncodeSavedICATTRIBUTE( _XimEncodeSavedICATTRIBUTE(
Xic ic, Xic ic,
XIMResourceList res_list, XIMResourceList res_list,
...@@ -1377,7 +1377,7 @@ _XimEncodeSavedICATTRIBUTE( ...@@ -1377,7 +1377,7 @@ _XimEncodeSavedICATTRIBUTE(
} }
#endif /* XIM_CONNECTABLE */ #endif /* XIM_CONNECTABLE */
Private unsigned int static unsigned int
_XimCountNumberOfAttr( _XimCountNumberOfAttr(
INT16 total, INT16 total,
CARD16 *attr, CARD16 *attr,
...@@ -1402,7 +1402,7 @@ _XimCountNumberOfAttr( ...@@ -1402,7 +1402,7 @@ _XimCountNumberOfAttr(
return n; return n;
} }
Public Bool Bool
_XimGetAttributeID( _XimGetAttributeID(
Xim im, Xim im,
CARD16 *buf) CARD16 *buf)
......
nx-X11/lib/X11/imThaiFlt.c
View file @ 11d6dac9
...@@ -81,7 +81,7 @@ SOFTWARE. ...@@ -81,7 +81,7 @@ SOFTWARE.
/* character classification table */ /* character classification table */
#define TACTIS_CHARS 256 #define TACTIS_CHARS 256
Private static
char const tactis_chtype[TACTIS_CHARS] = { char const tactis_chtype[TACTIS_CHARS] = {
CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 0 - 7 */ CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 0 - 7 */
CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 8 - 15 */ CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, CTRL, /* 8 - 15 */
...@@ -127,7 +127,7 @@ char const tactis_chtype[TACTIS_CHARS] = { ...@@ -127,7 +127,7 @@ char const tactis_chtype[TACTIS_CHARS] = {
#define CH_CLASSES 17 /* 17 classes of chars */ #define CH_CLASSES 17 /* 17 classes of chars */
Private static
char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = { char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = {
/* Table 0: writing/outputing rules */ /* Table 0: writing/outputing rules */
/* row: leading char, column: following char */ /* row: leading char, column: following char */
...@@ -151,7 +151,7 @@ char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = { ...@@ -151,7 +151,7 @@ char const write_rules_lookup[CH_CLASSES][CH_CLASSES] = {
,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, CP, NC, NC, NC, NC}/*AV3*/ ,{XC, NC, NC, NC, NC, NC, NC, NC, NC, NC, CP, NC, CP, NC, NC, NC, NC}/*AV3*/
}; };
Private static
char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = { char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = {
/* Table 1: WTT default input sequence check rules */ /* Table 1: WTT default input sequence check rules */
/* row: leading char, column: following char */ /* row: leading char, column: following char */
...@@ -175,7 +175,7 @@ char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = { ...@@ -175,7 +175,7 @@ char const wtt_isc1_lookup[CH_CLASSES][CH_CLASSES] = {
,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/ ,{XC, AC, AC, AC, AC, AC, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/
}; };
Private static
char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = { char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = {
/* Table 2: WTT strict input sequence check rules */ /* Table 2: WTT strict input sequence check rules */
/* row: leading char, column: following char */ /* row: leading char, column: following char */
...@@ -199,7 +199,7 @@ char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = { ...@@ -199,7 +199,7 @@ char const wtt_isc2_lookup[CH_CLASSES][CH_CLASSES] = {
,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/ ,{XC, AC, AC, AC, RJ, RJ, AC, RJ, RJ, RJ, CP, RJ, CP, RJ, RJ, RJ, RJ}/*AV3*/
}; };
Private static
char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = { char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = {
/* Table 3: Thaicat input sequence check rules */ /* Table 3: Thaicat input sequence check rules */
/* row: leading char, column: following char */ /* row: leading char, column: following char */
...@@ -225,7 +225,7 @@ char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = { ...@@ -225,7 +225,7 @@ char const thaicat_isc_lookup[CH_CLASSES][CH_CLASSES] = {
/* returns classification of a char */ /* returns classification of a char */
Private int static int
THAI_chtype (unsigned char ch) THAI_chtype (unsigned char ch)
{ {
return tactis_chtype[ch]; return tactis_chtype[ch];
...@@ -233,7 +233,7 @@ THAI_chtype (unsigned char ch) ...@@ -233,7 +233,7 @@ THAI_chtype (unsigned char ch)
#ifdef UNUSED #ifdef UNUSED
/* returns the display level */ /* returns the display level */
Private int static int
THAI_chlevel (unsigned char ch) THAI_chlevel (unsigned char ch)
{ {
int chlevel; int chlevel;
...@@ -274,7 +274,7 @@ THAI_chlevel (unsigned char ch) ...@@ -274,7 +274,7 @@ THAI_chlevel (unsigned char ch)
/* return True if char is non-spacing */ /* return True if char is non-spacing */
Private Bool static Bool
THAI_isdead (unsigned char ch) THAI_isdead (unsigned char ch)
{ {
return ((tactis_chtype[ch] == CTRL) || (tactis_chtype[ch] == BV1) || return ((tactis_chtype[ch] == CTRL) || (tactis_chtype[ch] == BV1) ||
...@@ -287,7 +287,7 @@ THAI_isdead (unsigned char ch) ...@@ -287,7 +287,7 @@ THAI_isdead (unsigned char ch)
/* return True if char is consonant */ /* return True if char is consonant */
Private Bool static Bool
THAI_iscons (unsigned char ch) THAI_iscons (unsigned char ch)
{ {
return (tactis_chtype[ch] == CONS); return (tactis_chtype[ch] == CONS);
...@@ -295,7 +295,7 @@ THAI_iscons (unsigned char ch) ...@@ -295,7 +295,7 @@ THAI_iscons (unsigned char ch)
/* return True if char is vowel */ /* return True if char is vowel */
Private Bool static Bool
THAI_isvowel (unsigned char ch) THAI_isvowel (unsigned char ch)
{ {
return ((tactis_chtype[ch] == LV) || (tactis_chtype[ch] == FV1) || return ((tactis_chtype[ch] == LV) || (tactis_chtype[ch] == FV1) ||
...@@ -307,14 +307,14 @@ THAI_isvowel (unsigned char ch) ...@@ -307,14 +307,14 @@ THAI_isvowel (unsigned char ch)
/* return True if char is tonemark */ /* return True if char is tonemark */
Private Bool static Bool
THAI_istone (unsigned char ch) THAI_istone (unsigned char ch)
{ {
return (tactis_chtype[ch] == TONE); return (tactis_chtype[ch] == TONE);
} }
#endif #endif
Private Bool static Bool
THAI_iscomposible ( THAI_iscomposible (
unsigned char follow_ch, unsigned char follow_ch,
unsigned char lead_ch) unsigned char lead_ch)
...@@ -324,7 +324,7 @@ THAI_iscomposible ( ...@@ -324,7 +324,7 @@ THAI_iscomposible (
== CP); == CP);
} }
Private Bool static Bool
THAI_isaccepted ( THAI_isaccepted (
unsigned char follow_ch, unsigned char follow_ch,
unsigned char lead_ch, unsigned char lead_ch,
...@@ -355,7 +355,7 @@ THAI_isaccepted ( ...@@ -355,7 +355,7 @@ THAI_isaccepted (
} }
#ifdef UNUSED #ifdef UNUSED
Private void static void
THAI_apply_write_rules( THAI_apply_write_rules(
unsigned char *instr, unsigned char *instr,
unsigned char *outstr, unsigned char *outstr,
...@@ -401,7 +401,7 @@ Output parameters: ...@@ -401,7 +401,7 @@ Output parameters:
} }
} }
Private int static int
THAI_find_chtype ( THAI_find_chtype (
unsigned char *instr, unsigned char *instr,
int chtype) int chtype)
...@@ -430,7 +430,7 @@ Output parameters: ...@@ -430,7 +430,7 @@ Output parameters:
} }
Private int static int
THAI_apply_scm( THAI_apply_scm(
unsigned char *instr, unsigned char *instr,
unsigned char *outstr, unsigned char *outstr,
...@@ -466,33 +466,33 @@ THAI_apply_scm( ...@@ -466,33 +466,33 @@ THAI_apply_scm(
/* The following functions are copied from XKeyBind.c */ /* The following functions are copied from XKeyBind.c */
Private void ComputeMaskFromKeytrans(); static void ComputeMaskFromKeytrans();
Private int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event); static int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event);
Private void SetLed(Display *dpy, int num, int state); static void SetLed(Display *dpy, int num, int state);
Private CARD8 FindKeyCode(); static CARD8 FindKeyCode();
/* The following functions are specific to this module */ /* The following functions are specific to this module */
Private int XThaiTranslateKey(); static int XThaiTranslateKey();
Private int XThaiTranslateKeySym(); static int XThaiTranslateKeySym();
Private KeySym HexIMNormalKey( static KeySym HexIMNormalKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol, KeySym symbol,
XKeyEvent *event); XKeyEvent *event);
Private KeySym HexIMFirstComposeKey( static KeySym HexIMFirstComposeKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol, KeySym symbol,
XKeyEvent *event); XKeyEvent *event);
Private KeySym HexIMSecondComposeKey( static KeySym HexIMSecondComposeKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol KeySym symbol
XKeyEvent *event); XKeyEvent *event);
Private KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2); static KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2);
Private void InitIscMode(Xic ic); static void InitIscMode(Xic ic);
Private Bool ThaiComposeConvert( static Bool ThaiComposeConvert(
Display *dpy, Display *dpy,
KeySym insym, KeySym insym,
KeySym *outsym, KeySym *lower, KeySym *upper); KeySym *outsym, KeySym *lower, KeySym *upper);
...@@ -530,7 +530,7 @@ Private Bool ThaiComposeConvert( ...@@ -530,7 +530,7 @@ Private Bool ThaiComposeConvert(
#define IC_DeletePreviousChar(ic) \ #define IC_DeletePreviousChar(ic) \
(IC_RealDeletePreviousChar(ic)) (IC_RealDeletePreviousChar(ic))
Private unsigned char static unsigned char
IC_RealGetPreviousChar(Xic ic, unsigned short pos) IC_RealGetPreviousChar(Xic ic, unsigned short pos)
{ {
XICCallback* cb = &ic->core.string_conversion_callback; XICCallback* cb = &ic->core.string_conversion_callback;
...@@ -597,7 +597,7 @@ IC_RealGetPreviousChar(Xic ic, unsigned short pos) ...@@ -597,7 +597,7 @@ IC_RealGetPreviousChar(Xic ic, unsigned short pos)
} }
} }
Private unsigned char static unsigned char
IC_RealDeletePreviousChar(Xic ic) IC_RealDeletePreviousChar(Xic ic)
{ {
XICCallback* cb = &ic->core.string_conversion_callback; XICCallback* cb = &ic->core.string_conversion_callback;
...@@ -701,8 +701,8 @@ typedef KeySym (*StateProc)( ...@@ -701,8 +701,8 @@ typedef KeySym (*StateProc)(
* State handler to implement the Thai hex input method. * State handler to implement the Thai hex input method.
*/ */
Private int const nstate_handlers = 3; static int const nstate_handlers = 3;
Private StateProc state_handler[] = { static StateProc state_handler[] = {
HexIMNormalKey, HexIMNormalKey,
HexIMFirstComposeKey, HexIMFirstComposeKey,
HexIMSecondComposeKey HexIMSecondComposeKey
...@@ -718,7 +718,7 @@ struct _XMapThaiKey { ...@@ -718,7 +718,7 @@ struct _XMapThaiKey {
KeySym to; KeySym to;
}; };
Private struct _XMapThaiKey const ThaiComposeTable[] = { static struct _XMapThaiKey const ThaiComposeTable[] = {
{ /* 0xa4 */ XK_currency, /* 0xa5 */ XK_yen }, { /* 0xa4 */ XK_currency, /* 0xa5 */ XK_yen },
{ /* 0xa2 */ XK_cent, /* 0xa3 */ XK_sterling }, { /* 0xa2 */ XK_cent, /* 0xa3 */ XK_sterling },
{ /* 0xe6 */ XK_ae, /* 0xef */ XK_idiaeresis }, { /* 0xe6 */ XK_ae, /* 0xef */ XK_idiaeresis },
...@@ -742,7 +742,7 @@ struct _XKeytrans { ...@@ -742,7 +742,7 @@ struct _XKeytrans {
/* Convert keysym to 'Thai Compose' keysym */ /* Convert keysym to 'Thai Compose' keysym */
/* The current implementation use latin-1 keysyms */ /* The current implementation use latin-1 keysyms */
Private Bool static Bool
ThaiComposeConvert( ThaiComposeConvert(
Display *dpy, Display *dpy,
KeySym insym, KeySym insym,
...@@ -762,7 +762,7 @@ ThaiComposeConvert( ...@@ -762,7 +762,7 @@ ThaiComposeConvert(
return False; return False;
} }
Private int static int
XThaiTranslateKey( XThaiTranslateKey(
register Display *dpy, register Display *dpy,
KeyCode keycode, KeyCode keycode,
...@@ -847,7 +847,7 @@ XThaiTranslateKey( ...@@ -847,7 +847,7 @@ XThaiTranslateKey(
* Should be changed to TACTIS keysyms when they are defined by the * Should be changed to TACTIS keysyms when they are defined by the
* standard. * standard.
*/ */
Private int static int
XThaiTranslateKeySym( XThaiTranslateKeySym(
Display *dpy, Display *dpy,
register KeySym symbol, register KeySym symbol,
...@@ -956,7 +956,7 @@ XThaiTranslateKeySym( ...@@ -956,7 +956,7 @@ XThaiTranslateKeySym(
/* /*
* given a KeySym, returns the first keycode containing it, if any. * given a KeySym, returns the first keycode containing it, if any.
*/ */
Private CARD8 static CARD8
FindKeyCode( FindKeyCode(
register Display *dpy, register Display *dpy,
register KeySym code) register KeySym code)
...@@ -980,7 +980,7 @@ FindKeyCode( ...@@ -980,7 +980,7 @@ FindKeyCode(
* what modifier it is bound to, if any. Sets the AnyModifier bit if it * what modifier it is bound to, if any. Sets the AnyModifier bit if it
* can't map some keysym to a modifier. * can't map some keysym to a modifier.
*/ */
Private void static void
ComputeMaskFromKeytrans( ComputeMaskFromKeytrans(
Display *dpy, Display *dpy,
register struct _XKeytrans *p) register struct _XKeytrans *p)
...@@ -1020,7 +1020,7 @@ ComputeMaskFromKeytrans( ...@@ -1020,7 +1020,7 @@ ComputeMaskFromKeytrans(
#define FIRST_COMPOSE_KEY_STATE 1 #define FIRST_COMPOSE_KEY_STATE 1
#define SECOND_COMPOSE_KEY_STATE 2 #define SECOND_COMPOSE_KEY_STATE 2
Private static
KeySym HexIMNormalKey( KeySym HexIMNormalKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol, KeySym symbol,
...@@ -1036,7 +1036,7 @@ KeySym HexIMNormalKey( ...@@ -1036,7 +1036,7 @@ KeySym HexIMNormalKey(
} }
Private static
KeySym HexIMFirstComposeKey( KeySym HexIMFirstComposeKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol, KeySym symbol,
...@@ -1059,7 +1059,7 @@ KeySym HexIMFirstComposeKey( ...@@ -1059,7 +1059,7 @@ KeySym HexIMFirstComposeKey(
return NoSymbol; return NoSymbol;
} }
Private static
KeySym HexIMSecondComposeKey( KeySym HexIMSecondComposeKey(
XicThaiPart *thai_part, XicThaiPart *thai_part,
KeySym symbol, KeySym symbol,
...@@ -1094,7 +1094,7 @@ KeySym HexIMSecondComposeKey( ...@@ -1094,7 +1094,7 @@ KeySym HexIMSecondComposeKey(
* The current implementation of this routine returns ISO Latin Keysyms. * The current implementation of this routine returns ISO Latin Keysyms.
*/ */
Private static
KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2) KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2)
{ {
int hi_digit; int hi_digit;
...@@ -1131,7 +1131,7 @@ int tactis_code; ...@@ -1131,7 +1131,7 @@ int tactis_code;
* 2) whether cancelling key event should be processed or ignored * 2) whether cancelling key event should be processed or ignored
*/ */
Private static
int IsCancelComposeKey( int IsCancelComposeKey(
KeySym *symbol, KeySym *symbol,
XKeyEvent *event) XKeyEvent *event)
...@@ -1163,7 +1163,7 @@ int IsCancelComposeKey( ...@@ -1163,7 +1163,7 @@ int IsCancelComposeKey(
* set specified keyboard LED on or off * set specified keyboard LED on or off
*/ */
Private static
void SetLed( void SetLed(
Display *dpy, Display *dpy,
int num, int num,
...@@ -1180,7 +1180,7 @@ void SetLed( ...@@ -1180,7 +1180,7 @@ void SetLed(
/* /*
* Initialize ISC mode from im modifier * Initialize ISC mode from im modifier
*/ */
Private void InitIscMode(Xic ic) static void InitIscMode(Xic ic)
{ {
Xim im; Xim im;
char *im_modifier_name; char *im_modifier_name;
...@@ -1213,7 +1213,7 @@ Private void InitIscMode(Xic ic) ...@@ -1213,7 +1213,7 @@ Private void InitIscMode(Xic ic)
/* /*
* Helper functions for _XimThaiFilter() * Helper functions for _XimThaiFilter()
*/ */
Private Bool static Bool
ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol) ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol)
{ {
DefTreeBase *b = &ic->private.local.base; DefTreeBase *b = &ic->private.local.base;
...@@ -1228,7 +1228,7 @@ ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol) ...@@ -1228,7 +1228,7 @@ ThaiFltAcceptInput(Xic ic, unsigned char new_char, KeySym symbol)
return True; return True;
} }
Private Bool static Bool
ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char) ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char)
{ {
DefTreeBase *b = &ic->private.local.base; DefTreeBase *b = &ic->private.local.base;
...@@ -1242,7 +1242,7 @@ ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char) ...@@ -1242,7 +1242,7 @@ ThaiFltReorderInput(Xic ic, unsigned char previous_char, unsigned char new_char)
return True; return True;
} }
Private Bool static Bool
ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol) ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol)
{ {
DefTreeBase *b = &ic->private.local.base; DefTreeBase *b = &ic->private.local.base;
...@@ -1258,7 +1258,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol) ...@@ -1258,7 +1258,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol)
return True; return True;
} }
Private unsigned static unsigned
NumLockMask(Display *d) NumLockMask(Display *d)
{ {
int i; int i;
......
nx-X11/lib/X11/imThaiIc.c
View file @ 11d6dac9
...@@ -42,7 +42,7 @@ THIS SOFTWARE. ...@@ -42,7 +42,7 @@ THIS SOFTWARE.
#include "Xlcint.h" #include "Xlcint.h"
#include "Ximint.h" #include "Ximint.h"
Private void static void
_XimThaiUnSetFocus( _XimThaiUnSetFocus(
XIC xic) XIC xic)
{ {
...@@ -55,7 +55,7 @@ _XimThaiUnSetFocus( ...@@ -55,7 +55,7 @@ _XimThaiUnSetFocus(
return; return;
} }
Private void static void
_XimThaiDestroyIC( _XimThaiDestroyIC(
XIC xic) XIC xic)
{ {
...@@ -81,7 +81,7 @@ _XimThaiDestroyIC( ...@@ -81,7 +81,7 @@ _XimThaiDestroyIC(
return; return;
} }
Private void static void
_XimThaiSetFocus( _XimThaiSetFocus(
XIC xic) XIC xic)
{ {
...@@ -102,7 +102,7 @@ _XimThaiSetFocus( ...@@ -102,7 +102,7 @@ _XimThaiSetFocus(
return; return;
} }
Private void static void
_XimThaiReset( _XimThaiReset(
XIC xic) XIC xic)
{ {
...@@ -115,7 +115,7 @@ _XimThaiReset( ...@@ -115,7 +115,7 @@ _XimThaiReset(
b->utf8[b->tree[ic->private.local.composed].utf8] = '\0'; b->utf8[b->tree[ic->private.local.composed].utf8] = '\0';
} }
Private char * static char *
_XimThaiMbReset( _XimThaiMbReset(
XIC xic) XIC xic)
{ {
...@@ -123,7 +123,7 @@ _XimThaiMbReset( ...@@ -123,7 +123,7 @@ _XimThaiMbReset(
return (char *)NULL; return (char *)NULL;
} }
Private wchar_t * static wchar_t *
_XimThaiWcReset( _XimThaiWcReset(
XIC xic) XIC xic)
{ {
...@@ -131,7 +131,7 @@ _XimThaiWcReset( ...@@ -131,7 +131,7 @@ _XimThaiWcReset(
return (wchar_t *)NULL; return (wchar_t *)NULL;
} }
Private XICMethodsRec Thai_ic_methods = { static XICMethodsRec Thai_ic_methods = {
_XimThaiDestroyIC, /* destroy */ _XimThaiDestroyIC, /* destroy */
_XimThaiSetFocus, /* set_focus */ _XimThaiSetFocus, /* set_focus */
_XimThaiUnSetFocus, /* unset_focus */ _XimThaiUnSetFocus, /* unset_focus */
......
nx-X11/lib/X11/imThaiIm.c
View file @ 11d6dac9
...@@ -46,7 +46,7 @@ THIS SOFTWARE. ...@@ -46,7 +46,7 @@ THIS SOFTWARE.
#include "XlcPubI.h" #include "XlcPubI.h"
#include "Ximint.h" #include "Ximint.h"
Private XIMMethodsRec Xim_im_thai_methods = { static XIMMethodsRec Xim_im_thai_methods = {
_XimThaiCloseIM, /* close */ _XimThaiCloseIM, /* close */
_XimLocalSetIMValues, /* set_values */ _XimLocalSetIMValues, /* set_values */
_XimLocalGetIMValues, /* get_values */ _XimLocalGetIMValues, /* get_values */
...@@ -76,7 +76,7 @@ _XimCheckIfThaiProcessing(Xim im) ...@@ -76,7 +76,7 @@ _XimCheckIfThaiProcessing(Xim im)
return(False); return(False);
} }
Public Bool Bool
_XimThaiOpenIM(Xim im) _XimThaiOpenIM(Xim im)
{ {
XLCd lcd = im->core.lcd; XLCd lcd = im->core.lcd;
...@@ -145,7 +145,7 @@ Open_Error : ...@@ -145,7 +145,7 @@ Open_Error :
return(False); return(False);
} }
Public void void
_XimThaiIMFree(Xim im) _XimThaiIMFree(Xim im)
{ {
if(im->core.im_resources) { if(im->core.im_resources) {
...@@ -215,7 +215,7 @@ _XimThaiIMFree(Xim im) ...@@ -215,7 +215,7 @@ _XimThaiIMFree(Xim im)
return; return;
} }
Public Status Status
_XimThaiCloseIM(XIM xim) _XimThaiCloseIM(XIM xim)
{ {
Xim im = (Xim)xim; Xim im = (Xim)xim;
......
nx-X11/lib/X11/imTrX.c
View file @ 11d6dac9
...@@ -60,7 +60,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -60,7 +60,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "XimTrInt.h" #include "XimTrInt.h"
#include "XimTrX.h" #include "XimTrX.h"
Private Bool static Bool
_XimXRegisterDispatcher( _XimXRegisterDispatcher(
Xim im, Xim im,
Bool (*callback)( Bool (*callback)(
...@@ -81,7 +81,7 @@ _XimXRegisterDispatcher( ...@@ -81,7 +81,7 @@ _XimXRegisterDispatcher(
return True; return True;
} }
Private void static void
_XimXFreeIntrCallback( _XimXFreeIntrCallback(
Xim im) Xim im)
{ {
...@@ -96,7 +96,7 @@ _XimXFreeIntrCallback( ...@@ -96,7 +96,7 @@ _XimXFreeIntrCallback(
return; return;
} }
Private Bool static Bool
_XimXCallDispatcher(Xim im, INT16 len, XPointer data) _XimXCallDispatcher(Xim im, INT16 len, XPointer data)
{ {
register XIntrCallbackRec *rec; register XIntrCallbackRec *rec;
...@@ -109,7 +109,7 @@ _XimXCallDispatcher(Xim im, INT16 len, XPointer data) ...@@ -109,7 +109,7 @@ _XimXCallDispatcher(Xim im, INT16 len, XPointer data)
return False; return False;
} }
Private Bool static Bool
_XimXFilterWaitEvent( _XimXFilterWaitEvent(
Display *d, Display *d,
Window w, Window w,
...@@ -137,7 +137,7 @@ _XimXFilterWaitEvent( ...@@ -137,7 +137,7 @@ _XimXFilterWaitEvent(
return ret; return ret;
} }
Private Bool static Bool
_CheckConnect( _CheckConnect(
Display *display, Display *display,
XEvent *event, XEvent *event,
...@@ -153,7 +153,7 @@ _CheckConnect( ...@@ -153,7 +153,7 @@ _CheckConnect(
return False; return False;
} }
Private Bool static Bool
_XimXConnect(Xim im) _XimXConnect(Xim im)
{ {
XEvent event; XEvent event;
...@@ -224,7 +224,7 @@ _XimXConnect(Xim im) ...@@ -224,7 +224,7 @@ _XimXConnect(Xim im)
return True; return True;
} }
Private Bool static Bool
_XimXShutdown(Xim im) _XimXShutdown(Xim im)
{ {
XSpecRec *spec = (XSpecRec *)im->private.proto.spec; XSpecRec *spec = (XSpecRec *)im->private.proto.spec;
...@@ -244,7 +244,7 @@ _XimXShutdown(Xim im) ...@@ -244,7 +244,7 @@ _XimXShutdown(Xim im)
return True; return True;
} }
Private char * static char *
_NewAtom( _NewAtom(
char *atomName) char *atomName)
{ {
...@@ -255,7 +255,7 @@ _NewAtom( ...@@ -255,7 +255,7 @@ _NewAtom(
return atomName; return atomName;
} }
Private Bool static Bool
_XimXWrite(Xim im, INT16 len, XPointer data) _XimXWrite(Xim im, INT16 len, XPointer data)
{ {
Atom atom; Atom atom;
...@@ -316,7 +316,7 @@ _XimXWrite(Xim im, INT16 len, XPointer data) ...@@ -316,7 +316,7 @@ _XimXWrite(Xim im, INT16 len, XPointer data)
return True; return True;
} }
Private Bool static Bool
_XimXGetReadData( _XimXGetReadData(
Xim im, Xim im,
char *buf, char *buf,
...@@ -440,7 +440,7 @@ _XimXGetReadData( ...@@ -440,7 +440,7 @@ _XimXGetReadData(
return True; return True;
} }
Private Bool static Bool
_CheckCMEvent( _CheckCMEvent(
Display *display, Display *display,
XEvent *event, XEvent *event,
...@@ -461,7 +461,7 @@ _CheckCMEvent( ...@@ -461,7 +461,7 @@ _CheckCMEvent(
return False; return False;
} }
Private Bool static Bool
_XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len) _XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len)
{ {
XEvent *ev; XEvent *ev;
...@@ -484,14 +484,14 @@ _XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len) ...@@ -484,14 +484,14 @@ _XimXRead(Xim im, XPointer recv_buf, int buf_len, int *ret_len)
return True; return True;
} }
Private void static void
_XimXFlush(Xim im) _XimXFlush(Xim im)
{ {
XFlush(im->core.display); XFlush(im->core.display);
return; return;
} }
Public Bool Bool
_XimXConf(Xim im, char *address) _XimXConf(Xim im, char *address)
{ {
XSpecRec *spec; XSpecRec *spec;
......
nx-X11/lib/X11/imTrans.c
View file @ 11d6dac9
...@@ -72,7 +72,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -72,7 +72,7 @@ PERFORMANCE OF THIS SOFTWARE.
#endif #endif
Private Bool static Bool
_XimTransConnect( _XimTransConnect(
Xim im) Xim im)
{ {
...@@ -122,7 +122,7 @@ _XimTransConnect( ...@@ -122,7 +122,7 @@ _XimTransConnect(
} }
Private Bool static Bool
_XimTransShutdown( _XimTransShutdown(
Xim im) Xim im)
{ {
...@@ -142,7 +142,7 @@ _XimTransShutdown( ...@@ -142,7 +142,7 @@ _XimTransShutdown(
Public Bool Bool
_XimTransRegisterDispatcher( _XimTransRegisterDispatcher(
Xim im, Xim im,
Bool (*callback)( Bool (*callback)(
...@@ -164,7 +164,7 @@ _XimTransRegisterDispatcher( ...@@ -164,7 +164,7 @@ _XimTransRegisterDispatcher(
} }
Public void void
_XimFreeTransIntrCallback( _XimFreeTransIntrCallback(
Xim im) Xim im)
{ {
...@@ -180,7 +180,7 @@ _XimFreeTransIntrCallback( ...@@ -180,7 +180,7 @@ _XimFreeTransIntrCallback(
} }
Public Bool Bool
_XimTransCallDispatcher(Xim im, INT16 len, XPointer data) _XimTransCallDispatcher(Xim im, INT16 len, XPointer data)
{ {
TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec; TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec;
...@@ -194,7 +194,7 @@ _XimTransCallDispatcher(Xim im, INT16 len, XPointer data) ...@@ -194,7 +194,7 @@ _XimTransCallDispatcher(Xim im, INT16 len, XPointer data)
} }
Public Bool Bool
_XimTransFilterWaitEvent( _XimTransFilterWaitEvent(
Display *d, Display *d,
Window w, Window w,
...@@ -209,7 +209,7 @@ _XimTransFilterWaitEvent( ...@@ -209,7 +209,7 @@ _XimTransFilterWaitEvent(
} }
Public void void
_XimTransInternalConnection( _XimTransInternalConnection(
Display *d, Display *d,
int fd, int fd,
...@@ -235,7 +235,7 @@ _XimTransInternalConnection( ...@@ -235,7 +235,7 @@ _XimTransInternalConnection(
} }
Public Bool Bool
_XimTransWrite(Xim im, INT16 len, XPointer data) _XimTransWrite(Xim im, INT16 len, XPointer data)
{ {
TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec; TransSpecRec *spec = (TransSpecRec *)im->private.proto.spec;
...@@ -252,7 +252,7 @@ _XimTransWrite(Xim im, INT16 len, XPointer data) ...@@ -252,7 +252,7 @@ _XimTransWrite(Xim im, INT16 len, XPointer data)
} }
Public Bool Bool
_XimTransRead( _XimTransRead(
Xim im, Xim im,
XPointer recv_buf, XPointer recv_buf,
...@@ -273,7 +273,7 @@ _XimTransRead( ...@@ -273,7 +273,7 @@ _XimTransRead(
} }
Public void void
_XimTransFlush( _XimTransFlush(
Xim im) Xim im)
{ {
...@@ -282,7 +282,7 @@ _XimTransFlush( ...@@ -282,7 +282,7 @@ _XimTransFlush(
Public Bool Bool
_XimTransConf( _XimTransConf(
Xim im, Xim im,
char *address) char *address)
......
nx-X11/lib/X11/imTransR.c
View file @ 11d6dac9
...@@ -57,7 +57,7 @@ PERFORMANCE OF THIS SOFTWARE. ...@@ -57,7 +57,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "XimTrInt.h" #include "XimTrInt.h"
#include "Ximint.h" #include "Ximint.h"
Public TransportSW _XimTransportRec[] = { TransportSW _XimTransportRec[] = {
{ "X", _XimXConf }, /* 1st entry must be X. { "X", _XimXConf }, /* 1st entry must be X.
This will be a fallback */ This will be a fallback */
#ifdef TCPCONN #ifdef TCPCONN
...@@ -75,25 +75,25 @@ Public TransportSW _XimTransportRec[] = { ...@@ -75,25 +75,25 @@ Public TransportSW _XimTransportRec[] = {
{ (char *)NULL, (Bool (*)(Xim, char *))NULL }, { (char *)NULL, (Bool (*)(Xim, char *))NULL },
}; };
Public Bool Bool
_XimConnect(Xim im) _XimConnect(Xim im)
{ {
return im->private.proto.connect(im); return im->private.proto.connect(im);
} }
Public Bool Bool
_XimShutdown(Xim im) _XimShutdown(Xim im)
{ {
return im->private.proto.shutdown(im); return im->private.proto.shutdown(im);
} }
Public Bool Bool
_XimWrite(Xim im, INT16 len, XPointer data) _XimWrite(Xim im, INT16 len, XPointer data)
{ {
return im->private.proto.write(im, len, data); return im->private.proto.write(im, len, data);
} }
Private int static int
_CheckProtocolData( _CheckProtocolData(
Xim im, Xim im,
char *recv_buf) char *recv_buf)
...@@ -104,7 +104,7 @@ _CheckProtocolData( ...@@ -104,7 +104,7 @@ _CheckProtocolData(
return data_len; return data_len;
} }
Private int static int
_XimReadData( _XimReadData(
Xim im, Xim im,
INT16 *len, INT16 *len,
...@@ -221,7 +221,7 @@ _XimReadData( ...@@ -221,7 +221,7 @@ _XimReadData(
return XIM_TRUE; return XIM_TRUE;
} }
Private Bool static Bool
_XimCallDispatcher( _XimCallDispatcher(
Xim im, Xim im,
INT16 len, INT16 len,
...@@ -230,7 +230,7 @@ _XimCallDispatcher( ...@@ -230,7 +230,7 @@ _XimCallDispatcher(
return im->private.proto.call_dispatcher(im, len, data); return im->private.proto.call_dispatcher(im, len, data);
} }
Public int int
_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size, _XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg) Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg)
{ {
...@@ -252,7 +252,7 @@ _XimRead(Xim im, INT16 *len, XPointer buf, int buf_size, ...@@ -252,7 +252,7 @@ _XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
return True; return True;
} }
Public Bool Bool
_XimRegisterDispatcher( _XimRegisterDispatcher(
Xim im, Xim im,
Bool (*callback)( Bool (*callback)(
...@@ -263,14 +263,14 @@ _XimRegisterDispatcher( ...@@ -263,14 +263,14 @@ _XimRegisterDispatcher(
return im->private.proto.register_dispatcher(im, callback, call_data); return im->private.proto.register_dispatcher(im, callback, call_data);
} }
Public void void
_XimFlush(Xim im) _XimFlush(Xim im)
{ {
im->private.proto.flush(im); im->private.proto.flush(im);
return; return;
} }
Public Bool Bool
_XimFilterWaitEvent(Xim im) _XimFilterWaitEvent(Xim im)
{ {
INT16 read_len; INT16 read_len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment