From: root <root>
Date: Sat, 11 Feb 2006 10:53:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=23ad5484465f8fcd579cdfcb64db7682fb04ed2c;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/command.C b/src/command.C
index 430b7927..9c6d7046 100644
--- a/src/command.C
+++ b/src/command.C
@@ -1721,7 +1721,7 @@ rxvt_term::focus_in ()
 #if USE_XIM
       if (Input_Context != NULL)
         {
-          IMSetStatusPosition ();
+          IMSetPosition ();
           XSetICFocus (Input_Context);
         }
 #endif
diff --git a/src/main.C b/src/main.C
index e0adece7..e309fd02 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1121,7 +1121,7 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, in
 #endif
 
 #ifdef USE_XIM
-  IMSetStatusPosition ();
+  IMSetPosition ();
 #endif
 }
 
@@ -1528,8 +1528,8 @@ foundpet:
                              status_attr, NULL);
 
   if (preedit_attr) XFree (preedit_attr);
-  if (status_attr) XFree (status_attr);
-  if (fs) XFreeFontSet (dpy, fs);
+  if (status_attr)  XFree (status_attr);
+  if (fs)           XFreeFontSet (dpy, fs);
 
   if (Input_Context == NULL)
     {
@@ -1544,8 +1544,7 @@ foundpet:
     vt_select_input ();
 #endif
 
-  if (input_style & XIMPreeditArea)
-    IMSetStatusPosition ();
+  IMSetPosition ();
 
   return true;
 }
@@ -1613,14 +1612,14 @@ done:
 }
 
 void
-rxvt_term::IMSetStatusPosition ()
+rxvt_term::IMSetPosition ()
 {
   XRectangle preedit_rect, status_rect, *needed_rect;
   XVaNestedList preedit_attr, status_attr;
 
   if (!Input_Context
       || !focus
-      || !(input_style & XIMPreeditArea)
+      || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
       || !IMisRunning ())
     return;
 
@@ -1633,11 +1632,12 @@ rxvt_term::IMSetStatusPosition ()
   XFree (needed_rect);
 
   preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
-  status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
+  status_attr  = XVaCreateNestedList (0, XNArea, &status_rect,  NULL);
 
   XSetICValues (Input_Context,
                 XNPreeditAttributes, preedit_attr,
-                XNStatusAttributes, status_attr, NULL);
+                XNStatusAttributes,  status_attr,
+                NULL);
 
   XFree (preedit_attr);
   XFree (status_attr);
diff --git a/src/rxvt.h b/src/rxvt.h
index b6208382..fe13899f 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1208,7 +1208,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   bool IMisRunning ();
   void IMSendSpot ();
   bool IM_get_IC (const char *modifiers);
-  void IMSetStatusPosition ();
+  void IMSetPosition ();
 #endif
 
   void resize_scrollbar ();