Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 59420 XIM: always uses on-the-spot after ProfileManager is invoked

Browse Source 
(check in for katakai@japan.sun.com)
r/sr=blizzard
This commit is contained in:
tajima%eng.sun.com 2001-05-16 04:04:12 +00:00
parent dafb775e27
commit 77a84ac937
3 changed files with 33 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
widget/src/gtk/nsGtkIMEHelper.cpp
View File

@ -38,8 +38,6 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CI
#ifdef USE_XIM
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
nsIMEPolicy nsIMEGtkIC::gInputPolicy = (nsIMEPolicy)0;
GdkIMStyle nsIMEGtkIC::gInputStyle = (GdkIMStyle)0;
nsIMEStatus *nsIMEGtkIC::gStatus = 0;
#endif // USE_XIM
@ -973,13 +971,13 @@ nsIMEGtkIC::SetFocusWindow(nsWindow * aFocusWindow)
gdk_im_begin((GdkIC *) mIC, gdkWindow);
if (gInputStyle & GDK_IM_PREEDIT_POSITION) {
if (mInputStyle & GDK_IM_PREEDIT_POSITION) {
SetPreeditArea(0, 0,
(int)((GdkWindowPrivate*)gdkWindow)->width,
(int)((GdkWindowPrivate*)gdkWindow)->height);
}
if (gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (gStatus) {
gStatus->setParentWindow(gdkWindow);
}
@ -1035,18 +1033,6 @@ nsIMEGtkIC::~nsIMEGtkIC()
mFocusWindow = 0;
}
// xim.input_policy:
//
// InputPolicy can be specified as "xim.input_policy", either
// "per-shell" or "per-widget".
// "per-widget" is default input policy, which means an IC will be
// created per shell widget. The input state (conversion mode on/off)
// can be shared among the shell widget.
#define PREF_XIM_INPUTPOLICY "xim.input_policy"
#define VAL_INPUTPOLICY_PERSHELL "per-shell" // default for on-the-spot
#define VAL_INPUTPOLICY_PERWIDGET "per-widget" // default for over-the-spot
// xim.input_style:
//
// "xim.input_style" preference is for switching XIM input style.
@ -1114,50 +1100,15 @@ XIMErrorHandler(Display *dpy, XErrorEvent *event) {
}
#endif
nsIMEPolicy
nsIMEGtkIC::GetInputPolicy() {
if (gInputPolicy) return gInputPolicy;
if (!gdk_im_ready()) {
gInputPolicy = NSIME_UNKNOWN;
return gInputPolicy;
}
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
if (!NS_FAILED(rv) && (prefs)) {
char *input_policy;
rv = prefs->CopyCharPref(PREF_XIM_INPUTPOLICY, &input_policy);
if (NS_SUCCEEDED(rv) && input_policy[0]) {
if (!nsCRT::strcmp(input_policy, VAL_INPUTPOLICY_PERSHELL)) {
gInputPolicy = NSIME_IC_PER_SHELL;
} else if (!nsCRT::strcmp(input_policy, VAL_INPUTPOLICY_PERWIDGET)) {
gInputPolicy = NSIME_IC_PER_WIDGET;
}
nsCRT::free(input_policy);
}
}
if (!gInputPolicy) {
// default
gInputPolicy = NSIME_IC_PER_SHELL;
}
return gInputPolicy;
}
GdkIMStyle
nsIMEGtkIC::GetInputStyle() {
if (gdk_im_ready() && gInputStyle) return gInputStyle;
#ifdef sun
// set error handler only once
if (gdk_error_handler == (XErrorHandler)NULL)
gdk_error_handler = XSetErrorHandler(XIMErrorHandler);
#endif
if (!gdk_im_ready()) {
gInputStyle = (GdkIMStyle)0;
return gInputStyle;
}
GdkIMStyle style;
GdkIMStyle ret_style = (GdkIMStyle)0;
PRInt32 ivalue = 0;
nsresult rv;
@ -1170,16 +1121,16 @@ nsIMEGtkIC::GetInputStyle() {
prefered_status_style = (GdkIMStyle) GDK_IM_STATUS_NOTHING;
style = gdk_im_decide_style((GdkIMStyle)(prefered_preedit_style | prefered_status_style));
if (style) {
gInputStyle = style;
ret_style = style;
} else {
style = gdk_im_decide_style((GdkIMStyle) (SUPPORTED_PREEDIT | SUPPORTED_STATUS));
if (style) {
gInputStyle = style;
ret_style = style;
} else {
gInputStyle = (GdkIMStyle)(GDK_IM_PREEDIT_NONE|GDK_IM_STATUS_NONE);
ret_style = (GdkIMStyle)(GDK_IM_PREEDIT_NONE|GDK_IM_STATUS_NONE);
}
}
return gInputStyle;
return ret_style;
#endif
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
@ -1243,16 +1194,16 @@ nsIMEGtkIC::GetInputStyle() {
}
style = gdk_im_decide_style((GdkIMStyle)(prefered_preedit_style | prefered_status_style));
if (style) {
gInputStyle = style;
ret_style = style;
} else {
style = gdk_im_decide_style((GdkIMStyle) (SUPPORTED_PREEDIT | SUPPORTED_STATUS));
if (style) {
gInputStyle = style;
ret_style = style;
} else {
gInputStyle = (GdkIMStyle)(GDK_IM_PREEDIT_NONE|GDK_IM_STATUS_NONE);
ret_style = (GdkIMStyle)(GDK_IM_PREEDIT_NONE|GDK_IM_STATUS_NONE);
}
}
return gInputStyle;
return ret_style;
}
PRInt32
@ -1313,7 +1264,7 @@ nsIMEGtkIC::ResetIC(PRUnichar **aUnichar, PRInt32 *aUnisize)
PRBool
nsIMEGtkIC::IsPreeditComposing()
{
if (gInputStyle & GDK_IM_PREEDIT_CALLBACKS) {
if (mInputStyle & GDK_IM_PREEDIT_CALLBACKS) {
if (mPreedit && mPreedit->GetPreeditLength()) {
return PR_TRUE;
} else {
@ -1350,7 +1301,7 @@ nsIMEGtkIC::SetPreeditFont(GdkFont *aFontset) {
void
nsIMEGtkIC::SetStatusFont(GdkFont *aFontset) {
if (gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (!gStatus) {
gStatus = new nsIMEStatus(aFontset);
} else {
@ -1412,17 +1363,22 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
}
if (!gdk_im_ready()) return; // nothing to do
mInputStyle = GetInputStyle();
if (!mInputStyle) {
return;
}
GdkICAttr *attr = gdk_ic_attr_new();
GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
attr->style = GetInputStyle();
attr->style = mInputStyle;
attr->client_window = gdkWindow;
attrmask = (GdkICAttributesType)(attrmask | GDK_IC_PREEDIT_COLORMAP);
attr->preedit_colormap = ((GdkWindowPrivate*)gdkWindow)->colormap;
attrmask = (GdkICAttributesType) (attrmask | GDK_IC_PREEDIT_POSITION_REQ);
if (!(gInputStyle & GDK_IM_PREEDIT_CALLBACKS)) {
if (!(mInputStyle & GDK_IM_PREEDIT_CALLBACKS)) {
attr->preedit_area.width = ((GdkWindowPrivate*)gdkWindow)->width;
attr->preedit_area.height = ((GdkWindowPrivate*)gdkWindow)->height;
attr->preedit_area.x = 0;
@ -1435,7 +1391,7 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
}
if (aStatusFontSet) {
if (gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (!gStatus) {
gStatus = new nsIMEStatus(aStatusFontSet);
}
@ -1454,8 +1410,8 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
// never becomes conversion ON, and is only used to be destroyed after
// the real active XIC is destroyed in ~nsIMEGtkIC.
if (gInputStyle & GDK_IM_PREEDIT_CALLBACKS ||
gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_PREEDIT_CALLBACKS ||
mInputStyle & GDK_IM_STATUS_CALLBACKS) {
// don't need to set actuall callbacks for this xic
mIC_backup = (GdkICPrivate *)gdk_ic_new(attr, attrmask);
}
@ -1470,7 +1426,7 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
XIC xic = ((GdkICPrivate *) IC)->xic;
/* set callbacks here */
if (gInputStyle & GDK_IM_PREEDIT_CALLBACKS) {
if (mInputStyle & GDK_IM_PREEDIT_CALLBACKS) {
XVaNestedList preedit_attr;
XIMCallback1 preedit_start_cb;
@ -1500,7 +1456,7 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
XFree(preedit_attr);
}
if (gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_STATUS_CALLBACKS) {
XIMCallback1 status_start_cb;
XIMCallback1 status_draw_cb;
XIMCallback1 status_done_cb;
@ -1525,7 +1481,7 @@ nsIMEGtkIC::nsIMEGtkIC(nsWindow *aFocusWindow, GdkFont *aFontSet,
0);
XFree(status_attr);
if (gInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (mInputStyle & GDK_IM_STATUS_CALLBACKS) {
if (!gStatus) {
gStatus = new nsIMEStatus();
}

10
widget/src/gtk/nsGtkIMEHelper.h
View File

@ -112,12 +112,6 @@ typedef struct {
class nsWindow;
enum nsIMEPolicy {
NSIME_UNKNOWN=0,
NSIME_IC_PER_SHELL=1,
NSIME_IC_PER_WIDGET=2
};
class nsIMEGtkIC {
private:
static int preedit_start_cbproc(XIC, XPointer, XPointer);
@ -127,8 +121,6 @@ class nsIMEGtkIC {
static int status_start_cbproc(XIC, XPointer, XPointer);
static int status_draw_cbproc(XIC, XPointer, XPointer);
static int status_done_cbproc(XIC, XPointer, XPointer);
static GdkIMStyle gInputStyle;
static nsIMEPolicy gInputPolicy;
static nsIMEStatus *gStatus;
nsWindow *mClientWindow;
nsWindow *mFocusWindow;
@ -147,8 +139,8 @@ class nsIMEGtkIC {
nsWindow* GetFocusWindow();
static void UnsetFocusWindow();
static GdkIMStyle GetInputStyle();
static nsIMEPolicy GetInputPolicy();
GdkIMStyle mInputStyle;
GdkFont *GetPreeditFont();
void SetPreeditFont(GdkFont*);
void SetStatusFont(GdkFont*);

17
widget/src/gtk/nsWindow.cpp
View File

@ -131,7 +131,6 @@ struct nsXICLookupEntry {
PLDHashTable nsWindow::gXICLookupTable;
GdkFont *nsWindow::gPreeditFontset = nsnull;
GdkFont *nsWindow::gStatusFontset = nsnull;
GdkIMStyle nsWindow::gInputStyle = (GdkIMStyle)nsnull;
#endif // USE_XIM
static void printDepth(int depth) {
@ -3722,7 +3721,7 @@ nsWindow::IMESetFocusWindow()
IMEComposeEnd(nsnull);
}
xic->SetFocusWindow(this);
if (gInputStyle & GDK_IM_PREEDIT_POSITION) {
if (xic->mInputStyle & GDK_IM_PREEDIT_POSITION) {
UpdateICSpot(xic);
PrimeICSpotTimer();
}
@ -3776,9 +3775,6 @@ nsWindow::IMEGetInputContext(PRBool aCreate)
// create new XIC
if (aCreate) {
if (gInputStyle == nsnull) {
gInputStyle = nsIMEGtkIC::GetInputStyle();
}
if (gPreeditFontset == nsnull) {
gPreeditFontset = gdk_fontset_load("-*-*-medium-r-*-*-16-*-*-*-*-*-*-*");
mXICFontSize = 16; // default
@ -3786,7 +3782,7 @@ nsWindow::IMEGetInputContext(PRBool aCreate)
if (gStatusFontset == nsnull) {
gStatusFontset = gdk_fontset_load("-*-*-medium-r-*-*-16-*-*-*-*-*-*-*");
}
if (!gInputStyle || !gPreeditFontset || !gStatusFontset) {
if (!gPreeditFontset || !gStatusFontset) {
return nsnull;
}
nsIMEGtkIC *xic = nsIMEGtkIC::GetXIC(mIMEShellWindow, gPreeditFontset,
@ -3906,10 +3902,9 @@ nsWindow::IMECommitEvent(GdkEventKey *aEvent) {
}
#ifdef USE_XIM
if (gInputStyle & GDK_IM_PREEDIT_POSITION) {
// update spot location
nsIMEGtkIC *xic = IMEGetInputContext(PR_FALSE);
if (xic) {
nsIMEGtkIC *xic = IMEGetInputContext(PR_FALSE);
if (xic) {
if (xic->mInputStyle & GDK_IM_PREEDIT_POSITION) {
nsWindow *window = xic->GetFocusWindow();
if (window) {
window->UpdateICSpot(xic);
@ -4016,7 +4011,7 @@ NS_IMETHODIMP nsWindow::ResetInputState()
// Call IMEComposeEnd() to reset the state of field
IMEComposeEnd(nsnull);
if (gInputStyle & GDK_IM_PREEDIT_POSITION) {
if (xic->mInputStyle & GDK_IM_PREEDIT_POSITION) {
UpdateICSpot(xic);
}
}