[uim-commit] r263 - trunk/xim
ekato@freedesktop.org
ekato@freedesktop.org
Wed Jan 12 00:54:43 PST 2005
Author: ekato
Date: 2005-01-12 00:54:40 -0800 (Wed, 12 Jan 2005)
New Revision: 263
Modified:
trunk/xim/canddisp.cpp
trunk/xim/canddisp.h
trunk/xim/compose.cpp
trunk/xim/compose.h
trunk/xim/connection.cpp
trunk/xim/connection.h
trunk/xim/convdisp.cpp
trunk/xim/convdisp.h
trunk/xim/helper.cpp
trunk/xim/helper.h
trunk/xim/locale.cpp
trunk/xim/main.cpp
trunk/xim/util.cpp
trunk/xim/util.h
trunk/xim/xdispatch.h
trunk/xim/xim.h
trunk/xim/ximic.cpp
trunk/xim/ximim.cpp
trunk/xim/ximpacket.cpp
trunk/xim/ximpn.h
trunk/xim/ximserver.cpp
trunk/xim/ximserver.h
trunk/xim/ximtrans.cpp
Log:
* xim/canddisp.cpp : Just update copyright.
* xim/canddisp.h : Ditto.
* xim/connection.cpp : Ditto.
* xim/connection.h : Ditto.
* xim/compose.cpp : Ditto.
* xim/compose.h : Ditto.
* xim/convdisp.cpp : Ditto.
* xim/convdisp.h : Ditto.
* xim/helper.cpp : Ditto.
* xim/helper.h : Ditto.
* xim/locale.cpp : Ditto.
* xim/main.cpp : Ditto.
* xim/util.cpp : Ditto.
* xim/util.h : Ditto.
* xim/xdispatch.h : Ditto.
* xim/xim.h : Ditto.
* xim/ximic.cpp : Ditto.
* xim/ximim.cpp : Ditto.
* xim/ximpacket.cpp : Ditto.
* xim/ximpn.h : Ditto.
* xim/ximtrans.cpp : Ditto.
* xim/ximserver.h : Ditto.
(class XimServer) : Add new private member mUsePreservedDefaultIM.
* xim/ximserver.cpp : Update copyright.
(XimServer::customContext) : Update ximserver's global im with
customized one.
Modified: trunk/xim/canddisp.cpp
===================================================================
--- trunk/xim/canddisp.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/canddisp.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/canddisp.h
===================================================================
--- trunk/xim/canddisp.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/canddisp.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/compose.cpp
===================================================================
--- trunk/xim/compose.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/compose.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/compose.h
===================================================================
--- trunk/xim/compose.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/compose.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/connection.cpp
===================================================================
--- trunk/xim/connection.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/connection.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/connection.h
===================================================================
--- trunk/xim/connection.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/connection.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/convdisp.cpp
===================================================================
--- trunk/xim/convdisp.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/convdisp.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/convdisp.h
===================================================================
--- trunk/xim/convdisp.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/convdisp.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/helper.cpp
===================================================================
--- trunk/xim/helper.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/helper.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/helper.h
===================================================================
--- trunk/xim/helper.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/helper.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/locale.cpp
===================================================================
--- trunk/xim/locale.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/locale.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/main.cpp
===================================================================
--- trunk/xim/main.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/main.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/util.cpp
===================================================================
--- trunk/xim/util.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/util.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/util.h
===================================================================
--- trunk/xim/util.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/util.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/xdispatch.h
===================================================================
--- trunk/xim/xdispatch.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/xdispatch.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/xim.h
===================================================================
--- trunk/xim/xim.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/xim.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/ximic.cpp
===================================================================
--- trunk/xim/ximic.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximic.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/ximim.cpp
===================================================================
--- trunk/xim/ximim.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximim.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/ximpacket.cpp
===================================================================
--- trunk/xim/ximpacket.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximpacket.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/ximpn.h
===================================================================
--- trunk/xim/ximpn.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximpn.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximserver.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
@@ -122,6 +122,7 @@
mIMName = strdup(name);
mIMLang = lang;
mLocale = lc;
+ mUsePreservedDefaultIM = false;
}
InputContext *XimServer::createContext(XimIC *xic, const char *engine)
@@ -155,6 +156,19 @@
}
void XimServer::customContext(const char *custom, const char *val) {
+ // Updated ximserver's global im with customized one.
+ // This is temporal hack.
+ if (!strcmp(custom, "custom-activate-default-im-name?")) {
+ if (!strcmp(val, "#t"))
+ mUsePreservedDefaultIM = true;
+ else
+ mUsePreservedDefaultIM = false;
+ }
+ if (!strcmp(custom, "custom-preserved-default-im-name") &&
+ mUsePreservedDefaultIM == true) {
+ set_im(val);
+ }
+
std::list<InputContext *>::iterator it;
for (it = ic_list.begin(); it != ic_list.end(); it++) {
(*it)->customContext(custom, val);
Modified: trunk/xim/ximserver.h
===================================================================
--- trunk/xim/ximserver.h 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximserver.h 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
@@ -249,6 +249,7 @@
char *mIMName;
const char *mIMLang;
std::list<InputContext *> ic_list;
+ bool mUsePreservedDefaultIM;
};
struct UIMInfo {
Modified: trunk/xim/ximtrans.cpp
===================================================================
--- trunk/xim/ximtrans.cpp 2005-01-11 22:55:05 UTC (rev 262)
+++ trunk/xim/ximtrans.cpp 2005-01-12 08:54:40 UTC (rev 263)
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003-2005 uim Project http://uim.freedesktop.org/
All rights reserved.
More information about the Uim-commit
mailing list