[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/iiimf/FC-4 iiimgcf-deadkey.patch, NONE, 1.1 iiimf.spec, 1.58, 1.59 xiiimp-pango.patch, 1.1, 1.2



Author: tagoh

Update of /cvs/dist/rpms/iiimf/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26078

Modified Files:
	iiimf.spec xiiimp-pango.patch 
Added Files:
	iiimgcf-deadkey.patch 
Log Message:
* Fri Jul 22 2005 Akira TAGOH <tagoh redhat com>
- Backported the patches from devel.
  - xiiimp-pango.patch: fixed to spot the correct location for the lookup
    window at the OverTheSpot. (#135368)
  - iiimgcf-deadkey.patch: applied to get the dead key working. (#163944)

iiimgcf-deadkey.patch:
 gtkimcontextiiim.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 gtkimcontextiiim.h |    1 
 2 files changed, 56 insertions(+), 1 deletion(-)

--- NEW FILE iiimgcf-deadkey.patch ---
diff -ruN -x .libs -x .deps -x '*~' -x '*o' -x '*a' -x Makefile iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.c iiimf-12.2/iiimgcf/gtkimcontextiiim.c
--- iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.c	2005-07-21 12:12:31.000000000 +0900
+++ iiimf-12.2/iiimgcf/gtkimcontextiiim.c	2005-07-22 17:05:03.000000000 +0900
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkimmodule.h>
 #include <gtk/gtkinvisible.h>
+#include <gtk/gtkimcontextsimple.h>
 #include <gdk/gdkproperty.h>
 #include <gdk/gdkselection.h>
 #include <stdlib.h>
@@ -46,6 +47,28 @@
 #define DEBUG_DO(x)
 #endif
 
+#define _IS_DEAD_KEY(keyval,sym)	((keyval) == GDK_dead_ ## sym)
+#define IS_DEAD_KEY(keyval)			\
+  (_IS_DEAD_KEY(keyval, grave) ||		\
+   _IS_DEAD_KEY(keyval, acute) ||		\
+   _IS_DEAD_KEY(keyval, circumflex) ||		\
+   _IS_DEAD_KEY(keyval, tilde) ||		\
+   _IS_DEAD_KEY(keyval, macron) ||		\
+   _IS_DEAD_KEY(keyval, breve) ||		\
+   _IS_DEAD_KEY(keyval, abovedot) ||		\
+   _IS_DEAD_KEY(keyval, diaeresis) ||		\
+   _IS_DEAD_KEY(keyval, abovering) ||		\
+   _IS_DEAD_KEY(keyval, doubleacute) ||		\
+   _IS_DEAD_KEY(keyval, caron) ||		\
+   _IS_DEAD_KEY(keyval, cedilla) ||		\
+   _IS_DEAD_KEY(keyval, ogonek) ||		\
+   _IS_DEAD_KEY(keyval, iota) ||		\
+   _IS_DEAD_KEY(keyval, voiced_sound) ||	\
+   _IS_DEAD_KEY(keyval, semivoiced_sound) ||	\
+   _IS_DEAD_KEY(keyval, belowdot) ||		\
+   _IS_DEAD_KEY(keyval, hook) ||		\
+   _IS_DEAD_KEY(keyval, horn))
+
 typedef struct _CandidateWindow CandidateWindow;
 
 /* Style for gtk input method preedit/status */
@@ -1530,6 +1553,16 @@
 }
 
 static void
+im_context_iiim_commit_cb(GtkIMContext *context,
+			  const gchar  *string,
+			  GtkIMContextIIIM *context_iiim)
+{
+  g_return_if_fail(string != NULL);
+
+  g_signal_emit_by_name(context_iiim, "commit", string);
+}
+
+static void
 im_context_iiim_init (GtkIMContextIIIM * im_context_iiim)
 {
   im_context_iiim->context = NULL;
@@ -1541,6 +1574,11 @@
   im_context_iiim->has_focus = FALSE;
   im_context_iiim->in_toplevel = FALSE;
 
+  /* for the dead key */
+  im_context_iiim->slave = g_object_new(GTK_TYPE_IM_CONTEXT_SIMPLE, NULL);
+  g_signal_connect(G_OBJECT(im_context_iiim->slave), "commit",
+		   G_CALLBACK(im_context_iiim_commit_cb), im_context_iiim);
+
   memset(&im_context_iiim->saved_key, 0, sizeof(im_context_iiim->saved_key));
 
   bindtextdomain (GETTEXT_PACKAGE, IIIMGCFLOCALEDIR);
@@ -1690,10 +1728,11 @@
   IIIMCF_keyevent kev;
   IIIMCF_event ev;
   gint store_key = 0;
+  static gboolean was_dead_key = FALSE;
 
   /* IIIMF doesn't recognize */
   if (event->type == GDK_KEY_RELEASE)
-    return FALSE;
+    return gtk_im_context_filter_keypress(context_iiim->slave, event);
 
   if (current_setting_enabled &&
       current_setting.im_enabled == IM_OFF)
@@ -1745,6 +1784,15 @@
     return FALSE;
 
  commit_this_event:
+  if (IS_DEAD_KEY(event->keyval)) {
+    /* don't send the dead key with the commit event! */
+    was_dead_key = TRUE;
+    return gtk_im_context_filter_keypress(context_iiim->slave, event);
+  } else if (was_dead_key == TRUE) {
+    was_dead_key = FALSE;
+    return gtk_im_context_filter_keypress(context_iiim->slave, event);
+  }
+  was_dead_key = FALSE;
   if (event->state &
       (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK))
     return FALSE;
@@ -1828,8 +1876,14 @@
   g_free (context_iiim->current_language);
 
   iiim_keylist_free (context_iiim);
+
+  g_signal_handlers_disconnect_by_func(context_iiim->slave,
+				       (gpointer)im_context_iiim_commit_cb,
+				       context_iiim);
+
   DEBUG_DO (g_message ("im_context_iiim_finalize"));
 
+  G_OBJECT_CLASS(parent_class)->finalize(obj);
 }
 
 static void
diff -ruN -x .libs -x .deps -x '*~' -x '*o' -x '*a' -x Makefile iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.h iiimf-12.2/iiimgcf/gtkimcontextiiim.h
--- iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.h	2005-07-21 12:12:31.000000000 +0900
+++ iiimf-12.2/iiimgcf/gtkimcontextiiim.h	2005-07-22 16:45:40.000000000 +0900
@@ -66,6 +66,7 @@
 struct _GtkIMContextIIIM
 {
   GtkIMContext object;
+  GtkIMContext *slave;
 
   GtkIIIMInfo *iiim_info;
   GdkWindow *client_window;


Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/FC-4/iiimf.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- iiimf.spec	20 Jul 2005 11:35:39 -0000	1.58
+++ iiimf.spec	22 Jul 2005 09:12:19 -0000	1.59
@@ -79,6 +79,7 @@
 Patch301: iiimgcf-event-status-done.patch
 Patch302: iiimgcf-fix-memory-leak-r2660.patch
 Patch303: iiimgcf-fix-hang-r2757.patch
+Patch304: iiimgcf-dead-key.patch
 ### RH-specific (+50~)
 Patch350: iiimgcf-revert-to-r2562-for-slowness-workaround.patch
 
@@ -424,6 +425,7 @@
 %patch301 -p1 -b .301-status_end
 %patch302 -p0 -b .302-memleak
 %patch303 -p0 -b .303-fix-hang
+%patch304 -p1 -b .304-deadkey
 ### RH-specific (+50~)
 %patch350 -p0 -R -b .350-revert-to-r2562
 ## IIIMJCF patches (400-)
@@ -1012,6 +1014,12 @@
 %endif
 
 %changelog
+* Fri Jul 22 2005 Akira TAGOH <tagoh redhat com>
+- Backported the patches from devel.
+  - xiiimp-pango.patch: fixed to spot the correct location for the lookup
+    window at the OverTheSpot. (#135368)
+  - iiimgcf-deadkey.patch: applied to get the dead key working. (#163944)
+
 * Wed Jul 20 2005 Akira TAGOH <tagoh redhat com> - 1:12.2-4.fc4.2
 - Backported the patches from devel.
   - leif-unit-fix-key-twice-r2614-162646.patch: backported a patch from

xiiimp-pango.patch:
 configure.ac            |   12 +
 iiimp/Makefile.am       |    3 
 iiimp/XimpConv.c        |    2 
 iiimp/codeinput.c       |   11 -
 iiimp/guiIMLookup.c     |  458 ++++++++++++++++++++++++++++++++++++++++++++----
 iiimp/guiIMLookup.h     |   17 +
 iiimp/guiIMSts.c        |  137 ++++++++++++++
 iiimp/guiIMSts.h        |   16 +
 iiimp/guiIMStsArea.c    |   19 +
 iiimp/guiIMStsNothing.c |   20 +-
 iiimp/iiimpAux.c        |    3 
 iiimp/iiimpColor.c      |   56 +++++
 iiimp/iiimpColor.h      |   15 +
 iiimp/iiimpConv.h       |    2 
 iiimp/popupIM.c         |  149 +++++++++++++++
 iiimp/popupIM.h         |   16 +
 iiimp/xfactory.c        |   43 ++++
 iiimp/xfactory.h        |   10 +
 18 files changed, 939 insertions(+), 50 deletions(-)

Index: xiiimp-pango.patch
===================================================================
RCS file: /cvs/dist/rpms/iiimf/FC-4/xiiimp-pango.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xiiimp-pango.patch	7 Jul 2005 11:52:05 -0000	1.1
+++ xiiimp-pango.patch	22 Jul 2005 09:12:19 -0000	1.2
@@ -1,6 +1,6 @@
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/configure.ac iiimf-12.2/iiimxcf/xiiimp.so/configure.ac
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/configure.ac	2005-05-02 22:16:12.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/configure.ac	2005-06-24 10:00:04.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/configure.ac iiimf-12.2/iiimxcf/xiiimp.so/configure.ac
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/configure.ac	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/configure.ac	2005-07-21 12:12:31.000000000 +0900
 @@ -61,6 +61,16 @@
  IM_CHECK_X
  IM_CHECK_XUTF8API
@@ -27,9 +27,9 @@
  
  AC_OUTPUT(Makefile iiimp/Makefile)
  
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/Makefile.am iiimf-12.2/iiimxcf/xiiimp.so/iiimp/Makefile.am
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/Makefile.am	2005-03-03 16:18:18.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/Makefile.am	2005-06-24 12:28:44.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/Makefile.am iiimf-12.2/iiimxcf/xiiimp.so/iiimp/Makefile.am
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/Makefile.am	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/Makefile.am	2005-07-21 12:12:31.000000000 +0900
 @@ -1,7 +1,7 @@
  moduledir = $(IMDIR)
  xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
@@ -47,9 +47,9 @@
                     $(DLOPEN_LIBS) $(THREAD_LIBS)
  xiiimp_la_SOURCES = \
  	KeyMap.c \
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/XimpConv.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/XimpConv.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/XimpConv.c	2005-03-11 09:50:06.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/XimpConv.c	2005-06-30 02:43:16.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/XimpConv.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/XimpConv.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/XimpConv.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/XimpConv.c	2005-07-21 12:12:31.000000000 +0900
 @@ -231,7 +231,7 @@
  static unsigned char look[BUF_SIZE] = {0};	/* Clean up bss */
  
@@ -59,9 +59,9 @@
  #endif /* !MAXINT */
  
  Public int
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/codeinput.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/codeinput.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/codeinput.c	2004-05-05 03:55:05.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/codeinput.c	2005-06-30 02:50:44.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/codeinput.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/codeinput.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/codeinput.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/codeinput.c	2005-07-21 12:12:31.000000000 +0900
 @@ -90,7 +90,7 @@
      hook = (LocalPreeditExt *)(ic->local_icpart->preedit_ext);
    }
@@ -101,9 +101,9 @@
      if (cb->callback &&
  	ic->core.input_style & XIMPreeditCallbacks)
        (*cb->callback)((XIC)ic, cb->client_data, NULL);
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c	2005-04-18 18:06:58.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c	2005-06-30 05:49:07.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.c	2005-07-21 16:04:46.000000000 +0900
 @@ -39,6 +39,9 @@
  Sun Microsystems, Inc. or its licensors is granted.
  
@@ -342,17 +342,16 @@
  
  static void
  selectCandidate(XicCommon ic, int idx) {
-@@ -271,7 +467,8 @@
+@@ -271,7 +467,7 @@
  	 index + 1 to keysym value */
        keysym = XK_0 + idx + 1;
    }
 -	  
 +
-+  printf("%s: keysym %X\n", __FUNCTION__, keysym);
    ev.xkey.x = 0;
    ev.xkey.y = 0;
    ev.xkey.x_root = 0;
-@@ -361,6 +558,94 @@
+@@ -361,6 +557,94 @@
    return True;
  }
  
@@ -447,7 +446,7 @@
  static void
  UpdateLookup(XicCommon ic) {
    LookupWin lookup = (LookupWin)(ic->gui_icpart->lookup);
-@@ -514,6 +799,7 @@
+@@ -514,6 +798,7 @@
  
    return;
  }
@@ -455,7 +454,7 @@
  
  static Bool
  SetupLookupExt(XicCommon ic) {
-@@ -534,12 +820,17 @@
+@@ -534,12 +819,17 @@
    Display *display = ic->core.im->core.display;
    Window parent, win;
    unsigned long fg, bg;
@@ -473,7 +472,7 @@
  
    TRACE_MESSAGE('l', ("SetupLookupWindow: 0x%08x\n", lookup->window));
  
-@@ -608,6 +899,22 @@
+@@ -608,6 +898,22 @@
  
    lookup->window = win;
  
@@ -496,7 +495,7 @@
    val_mask = GCForeground | GCBackground;
    gcval.foreground = fg;
    gcval.background = bg;
-@@ -629,6 +936,7 @@
+@@ -629,6 +935,7 @@
  						   XIM_IIIMP(ic->core.im, default_font_name));
      lookup->need_free_fontset = True;
    }
@@ -504,7 +503,7 @@
  
    return True;
  }
-@@ -638,6 +946,9 @@
+@@ -638,18 +945,23 @@
    LookupWin lookup = (LookupWin)(ic->gui_icpart->lookup);
    XPoint point;
    int x = 0, y = 0;	/* default */
@@ -513,8 +512,14 @@
 +#endif /* HAVE_PANGO */
  
    point.x = point.y = 0;	/* default */
-   if (XIMP_CHK_PREAREAMASK(ic)) {
-@@ -650,6 +961,13 @@
+-  if (XIMP_CHK_PREAREAMASK(ic)) {
+-    x = ic->core.preedit_attr.area.x;
+-    y = ic->core.preedit_attr.area.y;
+-    XFactoryGetLocationOnScreen(ic->core.im->core.display,
+-				ic->core.client_window, x, y, &point);
+-  } else if (XIMP_CHK_PRESPOTLMASK(ic)) {
++  if (XIMP_CHK_PRESPOTLMASK(ic)) {
+     point.x = -1;
      point.y = -1;
      PreeditCaretPlacement(ic, &point);
      if ((-1 == point.x) && (-1 == point.y)) {
@@ -528,7 +533,7 @@
        XFontSetExtents *fse;
        fse = XExtentsOfFontSet(lookup->fontset);
  
-@@ -657,6 +975,7 @@
+@@ -657,12 +969,18 @@
        y = ic->core.preedit_attr.spot_location.y;
        y += (fse->max_logical_extent.height + fse->max_logical_extent.y);
        y += yMargin;
@@ -536,7 +541,18 @@
      
        XFactoryGetLocationOnScreen(ic->core.im->core.display,
  				  ic->core.focus_window, x, y, &point);
-@@ -679,6 +998,7 @@
+     } else {
+       point.y += 4; /* offset */
+     }
++  } else if (XIMP_CHK_PREAREAMASK(ic)) {
++    x = ic->core.preedit_attr.area.x;
++    y = ic->core.preedit_attr.area.y;
++    XFactoryGetLocationOnScreen(ic->core.im->core.display,
++				ic->core.client_window, x, y, &point);
+   } else {
+       Window parent;
+       Window root;
+@@ -679,6 +997,7 @@
        point.y += border_width_return;
    }
  
@@ -544,7 +560,7 @@
    if (lookup->fontset) {
      XFontSetExtents *fse;
      fse = XExtentsOfFontSet(lookup->fontset);
-@@ -690,6 +1010,7 @@
+@@ -690,6 +1009,7 @@
        lookup->column_height = height;
      }
    }
@@ -552,15 +568,7 @@
  
    x = point.x;
    y = point.y;
-@@ -710,6 +1031,7 @@
-     XSetWMNormalHints (ic->core.im->core.display,
- 		       lookup->window, &hints);
-     XMoveWindow(ic->core.im->core.display, lookup->window, x, y);
-+    fprintf(stderr, "%s: %dx%d\n", __FUNCTION__, x, y);
-   }
-   lookup->x = point.x;
-   lookup->y = point.y;
-@@ -792,12 +1114,12 @@
+@@ -792,12 +1112,12 @@
  FreeLookupData(LookupWin lookup) {
    if (lookup->array_size == 0) return;
  
@@ -575,7 +583,7 @@
        if (lookup->candidates->label_feedback)
  	FreeFeedbackList(lookup->candidates->label_feedback[i],
  			 label[i].length);
-@@ -850,6 +1172,23 @@
+@@ -850,6 +1170,23 @@
    return;
  }
  
@@ -599,7 +607,7 @@
  static void
  CopyXIMText(XicCommon ic, XIMText *to, XIMText *from) {
    to->length = from->length;
-@@ -882,11 +1221,12 @@
+@@ -882,11 +1219,12 @@
  		sizeof(XIMFeedback) * to->length);
    return;
  }
@@ -613,7 +621,7 @@
    char *candidate;
    int len;
    int realRow = 0;
-@@ -896,6 +1236,10 @@
+@@ -896,6 +1234,10 @@
    XIMText *label;
    IMFeedbackList **value_flist, **label_flist;
    int actual_width = 0;
@@ -624,7 +632,7 @@
  
    if (lookup->array_size == 0) {
      lookup->array_size = 26;	/* init size */
-@@ -919,8 +1263,8 @@
+@@ -919,8 +1261,8 @@
      return False;
    }
  
@@ -635,7 +643,7 @@
  
    if (!lookup->candidates->label || !lookup->candidates->value) {
      /* something wrong */
-@@ -929,18 +1273,18 @@
+@@ -929,18 +1271,18 @@
    if (call_data->choices->label_feedback &&
        call_data->choices->value_feedback) {
      lookup->candidates->label_feedback =
@@ -658,7 +666,7 @@
    } else {
      lookup->candidates->label_feedback = 0;    
      lookup->candidates->value_feedback = 0;    
-@@ -952,20 +1296,20 @@
+@@ -952,20 +1294,20 @@
    value_flist = lookup->candidates->value_feedback;
  
    lookup->maxWidth = 0;
@@ -688,7 +696,7 @@
      if (call_data->choices->label_decoration != NO_DECORATION) {
        len = (label_str ? strlen(label_str) : 0) +
  	(value_str ? strlen(value_str) : 0) + 5;
-@@ -991,15 +1335,24 @@
+@@ -991,15 +1333,24 @@
      }
      if (value_str) strcat(candidate, value_str);
      len = strlen(candidate);
@@ -716,7 +724,7 @@
      if (i % lookup->ncolumns == 0) {
        realRow++;
      }
-@@ -1010,6 +1363,22 @@
+@@ -1010,6 +1361,22 @@
      lookup->maxWidth = (lookup->title_width / lookup->ncolumns);
    }
  
@@ -739,7 +747,7 @@
    if (lookup->nrows == 1)
      lookup->width = actual_width + cMargin * (lookup->length > lookup->ncolumns ?
  					      lookup->ncolumns : lookup->length); 
-@@ -1019,6 +1388,7 @@
+@@ -1019,6 +1386,7 @@
    lookup->height = (lookup->column_height + cMargin) * realRow;
    lookup->width -= cMargin;
    lookup->height -= cMargin;
@@ -747,7 +755,7 @@
  
    return True;
  }
-@@ -1032,7 +1402,7 @@
+@@ -1032,7 +1400,7 @@
  
    if (lookup->length == (call_data->last_index - call_data->first_index + 1) &&
        DRAW_NOTHING == (lookup->redraw = CompareLookupData(lookup->candidates,
@@ -756,7 +764,7 @@
  							  call_data->choices,
  							  call_data->first_index,
  							  lookup->length))) {
-@@ -1042,18 +1412,19 @@
+@@ -1042,18 +1410,19 @@
      lookup->n_choices = call_data->n_choices;
      lookup->first = call_data->first_index;
      lookup->last = call_data->last_index;
@@ -780,7 +788,7 @@
    return;
  }
  
-@@ -1069,16 +1440,22 @@
+@@ -1069,16 +1438,22 @@
  
    if ((call_data->title != NULL) && 
        (call_data->title->length != 0)) {
@@ -804,7 +812,7 @@
        XFactoryRemoveDecorationExceptTitle(display, lookup->window);
        free(lookup->title);
        lookup->title = strdup(title_string);
-@@ -1124,10 +1501,23 @@
+@@ -1124,10 +1499,23 @@
  
    if (!lookup) return;
  
@@ -828,7 +836,7 @@
    XDestroyWindow(ic->core.im->core.display,
  		 lookup->window);
    _XUnregisterFilter(ic->core.im->core.display, lookup->window,
-@@ -1141,8 +1531,10 @@
+@@ -1141,8 +1529,10 @@
    _XUnregisterFilter(ic->core.im->core.display, lookup->window,
  		     FilterButtonRelease, (XPointer)ic);
  
@@ -839,9 +847,9 @@
  
    if (lookup->candidateArray) Xfree(lookup->candidateArray);
    if (lookup->labelArray) Xfree(lookup->labelArray);
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h	2004-12-14 13:05:20.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h	2005-06-27 10:13:12.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMLookup.h	2005-07-21 12:12:31.000000000 +0900
 @@ -41,6 +41,14 @@
  */
  #ifndef _guiIM_LOOKUP_h
@@ -877,9 +885,9 @@
    int		nrows;
    int		ncolumns;
    int		choice_per_window;
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.c	2005-03-17 19:32:55.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.c	2005-06-28 22:02:28.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.c	2005-07-21 12:12:31.000000000 +0900
 @@ -46,6 +46,9 @@
  #include "XimpIm.h"
  #include "xfactory.h"
@@ -1147,9 +1155,9 @@
    return status_string;
  }
 +#endif /* HAVE_PANGO */
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.h	2001-03-16 00:52:22.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.h	2005-06-24 14:00:22.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMSts.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMSts.h	2005-07-21 12:12:31.000000000 +0900
 @@ -42,18 +42,34 @@
  #ifndef _guiIM_STS_h
  #define _guiIM_STS_h
@@ -1185,9 +1193,9 @@
    XIMText	text;
    IMFeedbackList  *feedback;
    int		x;
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c	2005-04-18 12:52:01.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c	2005-06-24 13:59:44.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c	2005-07-21 12:12:31.000000000 +0900
 @@ -39,6 +39,9 @@
  Sun Microsystems, Inc. or its licensors is granted.
  
@@ -1246,9 +1254,9 @@
  
    return;
  }
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c	2005-03-22 07:42:57.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c	2005-06-29 13:51:06.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/guiIMStsNothing.c	2005-07-21 12:12:31.000000000 +0900
 @@ -39,6 +39,9 @@
  Sun Microsystems, Inc. or its licensors is granted.
  
@@ -1299,9 +1307,9 @@
        /* avoid creating 0 width/height or too large status window */
        if (width == 0 || width > 1000) width = 100;
        if (height == 0 || height > 1000) height = 15;
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpAux.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpAux.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpAux.c	2005-03-22 07:42:57.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpAux.c	2005-06-30 01:31:36.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpAux.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpAux.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpAux.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpAux.c	2005-07-21 12:12:31.000000000 +0900
 @@ -169,6 +169,7 @@
  aux_string_length(
      const IIIMP_card16 *str
@@ -1326,9 +1334,9 @@
  	show_AC(pac->pad);
  #endif
  	if (pad->integer_count > 0) {
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.c	2004-05-05 03:55:05.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.c	2005-06-28 21:56:18.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.c	2005-07-21 12:12:31.000000000 +0900
 @@ -64,6 +64,62 @@
    BG_COLOR = (1L << 2)
  } IMSetColor;
@@ -1392,9 +1400,9 @@
  int
  SetIMColors(XicCommon ic,
  	    Display *display, Window win, GC gc, GC rgc,
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.h	2004-11-05 17:16:21.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.h	2005-06-28 21:58:07.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpColor.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpColor.h	2005-07-21 12:12:31.000000000 +0900
 @@ -47,12 +47,27 @@
  #ifndef _IIIMP_COLOR_H
  #define _IIIMP_COLOR_H
@@ -1423,18 +1431,18 @@
  extern int	SetIMColors(XicCommon ic,
  			    Display *display, Window win, GC gc, GC rgc,
  			    IMFeedbackList *flist, XIMFeedback unused);
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpConv.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.h	2005-03-07 18:09:42.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpConv.h	2005-06-30 02:54:22.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpConv.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/iiimpConv.h	2005-07-21 12:12:31.000000000 +0900
 @@ -62,4 +62,4 @@
      char **pstr
  );
  
 -#endif _IIIMP_CONV_H
 +#endif /* _IIIMP_CONV_H */
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.c	2005-03-03 16:18:18.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.c	2005-06-30 06:11:52.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.c	2005-07-21 12:12:31.000000000 +0900
 @@ -84,6 +84,21 @@
    return True;
  }
@@ -1727,9 +1735,9 @@
      if (XIM_POPUP(im, window)) {
        XDestroyWindow(im->core.display, XIM_POPUP(im, window));
      }
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.h	2001-03-16 00:52:22.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.h	2005-06-30 05:47:39.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/popupIM.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/popupIM.h	2005-07-21 12:12:31.000000000 +0900
 @@ -42,13 +42,29 @@
  #ifndef _popupIM_h
  #define _popupIM_h
@@ -1760,9 +1768,9 @@
    int		status_height;
    int	x;
    int	y;
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.c
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.c	2004-08-24 19:37:02.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.c	2005-06-28 21:57:14.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.c iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.c
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.c	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.c	2005-07-21 12:12:31.000000000 +0900
 @@ -39,6 +39,9 @@
  Sun Microsystems, Inc. or its licensors is granted.
  
@@ -1827,9 +1835,9 @@
  static XFontSet default_fontset = (XFontSet)0;
  static int ref_count = 0;
  
-diff -x libtool -x '*~' -x '*m4' -x Makefile -x Makefile.in -x 'config.*' -x configure -x .deps -x .libs -x autom4te.cache -x '*o' -x '*a' -x 'stamp*' -ruN iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.h
---- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.h	2004-11-05 17:16:21.000000000 +0900
-+++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.h	2005-06-28 21:57:43.000000000 +0900
+diff -ruN -x '*~' -x '*.o' -x .libs -x .deps iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.h iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.h
+--- iiimf-12.2.orig/iiimxcf/xiiimp.so/iiimp/xfactory.h	2005-07-21 15:45:02.000000000 +0900
++++ iiimf-12.2/iiimxcf/xiiimp.so/iiimp/xfactory.h	2005-07-21 12:12:31.000000000 +0900
 @@ -46,6 +46,12 @@
  
  #ifndef _XFACTORY_H


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]