Author: ek.kato
Date: Fri Sep 12 00:23:10 2008
New Revision: 5565
Added:
uim-chewing-trunk/pixmaps/
uim-chewing-trunk/pixmaps/Makefile.am
uim-chewing-trunk/pixmaps/chewing.svg
Modified:
uim-chewing-trunk/Makefile.am
uim-chewing-trunk/NEWS
uim-chewing-trunk/configure.ac
uim-chewing-trunk/scm/chewing.scm
Log:
* pixmaps/chewing.svg
* pixmaps/Makefile.am
- New.
* configure.ac
- Bump version.
- Icon support.
* pixmaps/chewing.scm: Adjust for uim 1.5.
* Makefile.am: Icon support.
* NEWS: Update.
Modified: uim-chewing-trunk/Makefile.am
==============================================================================
--- uim-chewing-trunk/Makefile.am (original)
+++ uim-chewing-trunk/Makefile.am Fri Sep 12 00:23:10 2008
@@ -1,4 +1,4 @@
-SUBDIRS = src scm
+SUBDIRS = src scm pixmaps
ChangeLog : FORCE
@cd $(top_srcdir); \
Modified: uim-chewing-trunk/NEWS
==============================================================================
--- uim-chewing-trunk/NEWS (original)
+++ uim-chewing-trunk/NEWS Fri Sep 12 00:23:10 2008
@@ -1,3 +1,8 @@
+Overview of changes from 0.0.2 to 0.0.3
+==
+ * Support libchewing >= 0.3.091
+
+
Overview of changes from 0.0.1 to 0.0.2
==
* New features
Modified: uim-chewing-trunk/configure.ac
==============================================================================
--- uim-chewing-trunk/configure.ac (original)
+++ uim-chewing-trunk/configure.ac Fri Sep 12 00:23:10 2008
@@ -1,28 +1,34 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([uim-chewing], [0.0.2])
+AC_INIT([uim-chewing], [0.0.3])
AM_INIT_AUTOMAKE(1.8.3)
AC_CONFIG_HEADER([config.h])
AC_PROG_CC
AC_PROG_LIBTOOL
+AC_PATH_PROG(RSVG, rsvg)
+
+AM_MAINTAINER_MODE
PKG_CHECK_MODULES(CHEWING, [chewing >= 0.3.091])
CHEWING_DATADIR=`$PKG_CONFIG chewing --variable=datadir`
AC_DEFINE_UNQUOTED(CHEWING_DATADIR, "$CHEWING_DATADIR", [Chewing data dir])
-PKG_CHECK_MODULES(UIM, [uim >= 1.2.0])
+PKG_CHECK_MODULES(UIM, [uim >= 1.5.0])
UIM_LIBDIR=`$PKG_CONFIG uim --variable=libdir`
UIM_SCMDIR=`$PKG_CONFIG uim --variable=uim_scmdir`
+uim_pixmapsdir=`$PKG_CONFIG uim --variable=uim_datadir`/pixmaps
AC_SUBST(CHEWING_DATADIR)
AC_SUBST(UIM_LIBDIR)
AC_SUBST(UIM_SCMDIR)
+AC_SUBST(uim_pixmapsdir)
AC_CONFIG_FILES([Makefile
scm/Makefile
src/Makefile
+ pixmaps/Makefile
])
AC_OUTPUT
Added: uim-chewing-trunk/pixmaps/Makefile.am
==============================================================================
--- (empty file)
+++ uim-chewing-trunk/pixmaps/Makefile.am Fri Sep 12 00:23:10 2008
@@ -0,0 +1,15 @@
+pixmapsdir = @uim_pixmapsdir@
+
+CHEWING_SVG = chewing.svg
+CHEWING_PNG = chewing.png
+
+EXTRA_DIST = $(CHEWING_PNG)
+
+dist_pixmaps_DATA = $(CHEWING_PNG)
+
+if MAINTAINER_MODE
+chewing.png: chewing.svg
+ if test -n "$(RSVG)"; then \
+ $(RSVG) -w48 -h48 -fpng $< $@; \
+ fi
+endif
Added: uim-chewing-trunk/pixmaps/chewing.svg
==============================================================================
--- (empty file)
+++ uim-chewing-trunk/pixmaps/chewing.svg Fri Sep 12 00:23:10 2008
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG
1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px"
+ y="0px" width="45.604px" height="44.596px" viewBox="0 0 45.604 44.596"
enable-background="new 0 0 45.604 44.596"
+ xml:space="preserve">
+<g>
+ <path
d="M16.227,5.7c0.528,0,1.223,0.215,2.083,0.645c0.529,0.231,0.794,0.546,0.794,0.943c0,0.265-0.296,0.479-0.894,0.645
+
c-0.761,0.297-2.396,0.66-4.91,1.09c0,0.067,0,0.133,0,0.199c0,0.167-0.033,0.447-0.099,0.844c-0.1,0.663-0.199,2.115-0.298,4.364
+
c0,0.166,0,0.33,0,0.496c0.032-0.033,0.066-0.049,0.099-0.049c1.72-0.562,2.728-0.843,3.025-0.843c0.264,0,0.744,0.248,1.438,0.744
+
c1.094,0.628,1.638,1.224,1.638,1.785c0,0.233-0.147,0.663-0.445,1.29c-0.167,0.629-0.267,3.407-0.301,8.333
+
c0,1.192,0.118,4.053,0.349,8.582c0,1.059-0.266,2.085-0.794,3.075c-0.595,0.794-1.091,1.191-1.488,1.191
+
c-0.265,0-0.513-0.267-0.744-0.794c-0.431-0.961-0.811-1.736-1.141-2.332c-0.728,0.032-1.423,0.083-2.083,0.149l-5.406,0.495
+
c-0.992,0.1-1.752,0.149-2.282,0.149c-0.231,0-0.447,0-0.646,0c0,0.198-0.016,0.365-0.05,0.496
+
C3.943,38.025,3.728,38.44,3.43,38.44c-0.365,0-0.712-0.3-1.041-0.896c-0.466-0.794-0.695-1.588-0.695-2.381
+
c0-0.363,0.051-0.712,0.15-1.04c0.23-0.927,0.412-2.3,0.545-4.118c0.165-1.751,0.248-4.659,0.248-8.728
+
c0-1.919-0.282-3.275-0.843-4.068c-0.198-0.299-0.297-0.512-0.297-0.646c0-0.264,0.249-0.397,0.744-0.397
+
c0.661,0,1.205,0.117,1.637,0.348c1.059-0.099,2.149-0.249,3.274-0.446c0-0.132,0-0.281,0-0.447v-1.934
+
c0-1.123-0.067-2.049-0.198-2.778c-0.033-0.364-0.117-0.694-0.248-0.993c-0.365,0.034-0.678,0.05-0.943,0.05
+
c-1.321,0-2.231-0.132-2.727-0.397C2.504,9.173,2.24,8.86,2.24,8.627c0-0.198,0.496-0.331,1.488-0.397
+
c2.182-0.231,4.58-0.628,7.192-1.19c1.885-0.33,3.39-0.695,4.514-1.092C15.798,5.783,16.063,5.7,16.227,5.7z
M4.273,34.915
+
c2.481-0.166,4.778-0.414,6.895-0.745c1.389-0.229,2.298-0.347,2.728-0.347c0.397,0,1.024,0.2,1.884,0.595
+
c0.067-0.228,0.116-0.493,0.149-0.793c0.198-0.99,0.297-3.273,0.297-6.845c0-0.496,0-0.976,0-1.438
+
c-0.463,0.1-0.992,0.149-1.587,0.149c-0.728,0-1.406-0.149-2.033-0.448c-1.093-0.497-1.638-1.57-1.638-3.224
+
c0-0.993-0.032-2.71-0.1-5.16c-0.627,0.1-1.273,0.217-1.933,0.347c-0.099,1.323-0.266,2.547-0.496,3.67
+
c-0.298,1.357-0.694,2.481-1.191,3.374c-0.43,0.827-1.091,1.653-1.984,2.481C5,26.699,4.77,26.848,4.571,26.978
+ C4.505,30.517,4.406,33.162,4.273,34.915z
M4.62,25.837c0.429-0.595,0.761-1.141,0.992-1.638c0.529-1.124,0.91-2.396,1.142-3.818
+
c0.165-0.893,0.28-1.886,0.347-2.977c-0.166,0.067-0.314,0.117-0.446,0.149c-0.959,0.231-1.588,0.347-1.885,0.347
+ c0,0.067,0,0.133,0,0.199C4.737,21.011,4.687,23.591,4.62,25.837z
M11.366,28.764c0.296,0,0.91,0.082,1.836,0.249
+
c0.826,0.266,1.239,0.514,1.239,0.745c0,0.33-0.514,0.578-1.537,0.743c-0.43,0.099-0.794,0.182-1.092,0.248
+
c-0.298,0.099-1.024,0.267-2.183,0.495c-0.628,0.167-1.091,0.248-1.388,0.248c-0.628,0-1.141-0.081-1.538-0.248
+
c-0.629-0.229-0.943-0.477-0.943-0.743c0-0.297,0.514-0.479,1.539-0.546c1.224-0.23,2.396-0.562,3.521-0.994
+ C11.152,28.831,11.334,28.764,11.366,28.764z
M10.82,15.373c-0.032-2.083-0.049-3.687-0.049-4.812v-1.14
+
C10.242,9.488,9.763,9.553,9.333,9.62c0.099,0.132,0.148,0.247,0.148,0.346c0,0.133-0.049,0.315-0.148,0.546
+
c-0.166,0.594-0.265,1.208-0.297,1.835l-0.05,3.422C9.581,15.636,10.193,15.506,10.82,15.373z
M12.855,16.413
+
c-0.099,2.612-0.148,4.348-0.148,5.208c0,1.289,0.396,1.934,1.19,1.934c0.166,0,0.512-0.033,1.042-0.099
+
c0.528-0.065,0.942-0.101,1.239-0.101c0-2.677-0.033-4.611-0.098-5.802c0-0.694-0.281-1.042-0.844-1.042
+
c-0.265-0.099-0.711-0.148-1.339-0.148C13.565,16.364,13.218,16.381,12.855,16.413z
M24.76,9.024c0.328,0,0.759,0.149,1.288,0.446
+
c1.191,0.694,1.786,1.323,1.786,1.885c0,0.133-0.084,0.315-0.25,0.545c-0.198,0.298-0.395,0.664-0.594,1.093
+
c-0.565,1.157-1.109,2.198-1.636,3.124c1.42-0.198,2.925-0.446,4.512-0.744l-0.101-9.474c-0.03-0.496-0.23-1.042-0.596-1.636
+
c-0.229-0.298-0.346-0.528-0.346-0.694c0-0.496,0.378-0.744,1.141-0.744c0.662,0,1.472,0.166,2.432,0.496
+
c0.693,0.332,1.042,0.678,1.042,1.042c0,0.297-0.051,0.613-0.148,0.942c-0.168,0.595-0.247,1.125-0.247,1.588l-0.249,7.936
+
c1.452-0.298,2.646-0.613,3.568-0.942c0.365-0.167,0.629-0.249,0.797-0.249c0.527,0,1.206,0.216,2.032,0.645
+
c0.563,0.23,0.845,0.545,0.845,0.942c0,0.266-0.299,0.48-0.893,0.645c-0.73,0.297-2.349,0.662-4.863,1.09
+
c-0.562,0.1-1.091,0.182-1.586,0.249l-0.147,5.06c3.469-0.595,5.803-0.992,6.993-1.19c0.627-0.167,0.991-0.247,1.091-0.247
+
c0.428,0,1.139,0.214,2.132,0.644c1.026,0.464,1.539,0.827,1.539,1.092c0,0.396-0.347,0.662-1.043,0.792
+
c-0.396,0.134-1.205,0.199-2.43,0.199c-2.812,0-5.771,0.23-8.878,0.694c-4.202,0.663-7.028,1.191-8.485,1.588
+
c-0.463,0.132-0.808,0.198-1.039,0.198c-0.331,0-0.909-0.216-1.737-0.645c-0.663-0.364-0.991-0.661-0.991-0.895
+
c0-0.196,0.265-0.329,0.793-0.396c2.645-0.331,5.704-0.777,9.175-1.34c0.099,0,0.199-0.016,0.298-0.049l-0.049-5.06
+
c-1.389,0.166-2.416,0.247-3.075,0.247c-1.127,0-1.951-0.099-2.482-0.297c-0.064,0.133-0.131,0.248-0.2,0.347
+
c-0.758,1.125-1.617,2.066-2.576,2.827c-0.628,0.562-1.059,0.844-1.29,0.844h-0.195c0-0.066,0.05-0.199,0.149-0.396
+
c0.627-1.059,1.254-2.333,1.885-3.821c0.596-1.354,1.123-2.894,1.585-4.612c0.297-1.092,0.444-2.1,0.444-3.026
+ C24.16,9.272,24.36,9.024,24.76,9.024z
M23.567,28.961c0.63,0,1.157,0.101,1.591,0.3c0.263,0.067,0.496,0.15,0.695,0.249
+
c1.487-0.099,3.188-0.282,5.108-0.549c1.947-0.329,3.685-0.692,5.203-1.09c0.665-0.164,1.111-0.247,1.343-0.247
+
c0.396,0,1.009,0.23,1.835,0.694c0.993,0.627,1.488,1.108,1.488,1.439c0,0.132-0.118,0.33-0.347,0.594
+
c-0.298,0.331-0.545,0.793-0.744,1.39c-0.365,1.06-0.777,2.58-1.241,4.562c-0.033,0.069-0.066,0.117-0.099,0.149
+
c0.562,0.398,0.844,0.745,0.844,1.042c0,0.199-0.134,0.299-0.396,0.299c-1.29,0-2.448,0.066-3.476,0.197l-4.91,0.497
+
c-0.892,0.1-1.57,0.148-2.032,0.148c-0.396,0-0.745-0.033-1.043-0.099c-0.03,0.229-0.099,0.428-0.196,0.595
+
c-0.167,0.329-0.331,0.497-0.497,0.497c-0.268,0-0.48-0.182-0.645-0.547c-0.332-0.495-0.515-1.024-0.546-1.588l-0.497-2.877
+
c-0.197-1.455-0.397-2.48-0.596-3.073c-0.167-0.597-0.528-1.173-1.091-1.737c-0.231-0.13-0.349-0.214-0.349-0.248
+ C22.971,29.161,23.169,28.961,23.567,28.961z
M27.386,36.851c2.35-0.133,4.53-0.38,6.55-0.745c0.924-0.198,1.603-0.312,2.033-0.348
+
c0.195-0.76,0.363-1.719,0.493-2.877c0.199-1.223,0.299-2.148,0.299-2.779c0-0.364-0.461-0.544-1.39-0.544
+
c-0.494,0-1.885,0.217-4.164,0.643c-2.348,0.432-3.853,0.716-4.514,0.846c0.032,0.296,0.066,0.595,0.099,0.893
+ C27.122,34.056,27.319,35.695,27.386,36.851z"/>
+</g>
+<g>
+</g>
+</svg>
Modified: uim-chewing-trunk/scm/chewing.scm
==============================================================================
--- uim-chewing-trunk/scm/chewing.scm (original)
+++ uim-chewing-trunk/scm/chewing.scm Fri Sep 12 00:23:10 2008
@@ -1,5 +1,5 @@
;;;
-;;; Copyright (c) 2006 uim Project http://uim.freedesktop.org/
+;;; Copyright (c) 2006-2008 uim Project http://uim.freedesktop.org/
;;;
;;; All rights reserved.
;;;
@@ -267,7 +267,7 @@
(define chewing-release-key-handler
(lambda (mc key key-state)
(if (or
- (control-char? key)
+ (ichar-control? key)
(not (chewing-context-on mc)))
(chewing-commit-raw mc))))
