aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/xlibi18n/IMWrap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/xlibi18n/IMWrap.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/xlibi18n/IMWrap.c')
-rw-r--r--libX11/src/xlibi18n/IMWrap.c44
1 files changed, 16 insertions, 28 deletions
diff --git a/libX11/src/xlibi18n/IMWrap.c b/libX11/src/xlibi18n/IMWrap.c
index a90b40675..1e5b8f0b4 100644
--- a/libX11/src/xlibi18n/IMWrap.c
+++ b/libX11/src/xlibi18n/IMWrap.c
@@ -11,10 +11,10 @@
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the names of Open Software Foundation and
- * Sony Corporation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Open Software Foundation and Sony Corporation make no
- * representations about the suitability of this software for any purpose.
+ * Sony Corporation not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Open Software Foundation and Sony Corporation make no
+ * representations about the suitability of this software for any purpose.
* It is provided "as is" without express or implied warranty.
*
* OPEN SOFTWARE FOUNDATION AND SONY CORPORATION DISCLAIM ALL
@@ -24,11 +24,11 @@
* INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * M. Collins OSF
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * M. Collins OSF
* Makoto Wakamatsu Sony Corporation
- */
+ */
/*
Copyright 1991, 1998 The Open Group
@@ -69,9 +69,7 @@ from The Open Group.
* Compile the resource name. (resource_name ---> xrm_name)
*/
void
-_XIMCompileResourceList(res, num_res)
- register XIMResourceList res;
- unsigned int num_res;
+_XIMCompileResourceList(XIMResourceList res, unsigned int num_res)
{
register unsigned int count;
@@ -81,10 +79,7 @@ _XIMCompileResourceList(res, num_res)
}
void
-_XCopyToArg(src, dst, size)
- XPointer src;
- XPointer *dst;
- register unsigned int size;
+_XCopyToArg(XPointer src, XPointer *dst, unsigned int size)
{
if (!*dst) {
union {
@@ -121,12 +116,8 @@ _XCopyToArg(src, dst, size)
* a XIM object and return a pointer the newly created XIM back to the caller.
*/
-XIM
-XOpenIM( display, rdb, res_name, res_class )
- Display *display;
- XrmDatabase rdb;
- char *res_name;
- char *res_class;
+XIM
+XOpenIM(Display *display, XrmDatabase rdb, char *res_name, char *res_class)
{
XLCd lcd = _XOpenLC( (char *)NULL );
@@ -139,13 +130,12 @@ XOpenIM( display, rdb, res_name, res_class )
* Close the connection to the input manager, and free the XIM structure
*/
Status
-XCloseIM(im)
- XIM im;
+XCloseIM(XIM im)
{
Status s;
XIC ic;
XLCd lcd = im->core.lcd;
-
+
s = (im->methods->close) (im);
for (ic = im->core.ic_chain; ic; ic = ic->core.next)
ic->core.im = (XIM)NULL;
@@ -158,8 +148,7 @@ XCloseIM(im)
* Return the Display associated with the input method.
*/
Display *
-XDisplayOfIM(im)
- XIM im;
+XDisplayOfIM(XIM im)
{
return im->core.display;
}
@@ -168,8 +157,7 @@ XDisplayOfIM(im)
* Return the Locale associated with the input method.
*/
char *
-XLocaleOfIM(im)
- XIM im;
+XLocaleOfIM(XIM im)
{
return im->core.lcd->core->name;
}