Hello community, here is the log from the commit of package fcitx-rime for openSUSE:Factory checked in at 2012-10-23 21:24:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-rime (Old) and /work/SRC/openSUSE:Factory/.fcitx-rime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-rime", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-rime/fcitx-rime.changes 2012-09-20 15:28:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-rime.new/fcitx-rime.changes 2012-10-23 21:24:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 11 19:28:06 UTC 2012 - [email protected] + +- update version 0.1.2 + * build with librime 0.9.4 + +------------------------------------------------------------------- Old: ---- fcitx-rime-0.1.1.tar.bz2 New: ---- fcitx-rime-0.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-rime.spec ++++++ --- /var/tmp/diff_new_pack.P8Kgg7/_old 2012-10-23 21:24:14.000000000 +0200 +++ /var/tmp/diff_new_pack.P8Kgg7/_new 2012-10-23 21:24:14.000000000 +0200 @@ -16,7 +16,7 @@ # Name: fcitx-rime -Version: 0.1.1 +Version: 0.1.2 Release: 0 License: GPL-2.0+ Summary: Rime input engine support for Fcitx @@ -80,7 +80,6 @@ %{_libdir}/fcitx/%{name}.so %{_datadir}/fcitx/addon/%{name}.conf %{_datadir}/fcitx/inputmethod/rime.conf -%{_datadir}/fcitx/rime/ %{_datadir}/fcitx/skin/classic/rime.png %{_datadir}/fcitx/skin/dark/rime.png %{_datadir}/fcitx/skin/default/rime.png ++++++ fcitx-rime-0.1.1.tar.bz2 -> fcitx-rime-0.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/CMakeLists.txt new/fcitx-rime-0.1.2/CMakeLists.txt --- old/fcitx-rime-0.1.1/CMakeLists.txt 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 @@ -7,7 +7,13 @@ include(FindPkgConfig) find_package(Fcitx 4.2.0 REQUIRED) find_package(Rime REQUIRED) -find_package(Brise REQUIRED) + +if(NOT DEFINED RIME_DATA_DIR) + find_package(Brise REQUIRED) + set(RIME_DATA_DIR ${BRISE_DIR}) +endif(NOT DEFINED RIME_DATA_DIR) +message(STATUS "Precompiler macro RIME_DATA_DIR is set to \"${RIME_DATA_DIR}\"") +add_definitions(-DRIME_DATA_DIR="${RIME_DATA_DIR}") set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/cmake/FindBrise.cmake new/fcitx-rime-0.1.2/cmake/FindBrise.cmake --- old/fcitx-rime-0.1.1/cmake/FindBrise.cmake 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/cmake/FindBrise.cmake 2012-10-04 14:34:39.000000000 +0200 @@ -4,11 +4,12 @@ # BRISE_FOUND - System has brise package # BRISE_DIR - Brise absolute path -set(BRISE_FIND_DIR "${PROJECT_SOURCE_DIR}/../brise" - "${CMAKE_INSTALL_PREFIX}/share/brise" - "${CMAKE_INSTALL_PREFIX}/share/rime/brise" +set(BRISE_FIND_DIR "${CMAKE_INSTALL_PREFIX}/share/brise" + "${CMAKE_INSTALL_PREFIX}/share/rime-data" + "${CMAKE_INSTALL_PREFIX}/share/rime/data" "/usr/share/brise" - "/usr/share/rime/brise") + "/usr/share/rime-data" + "/usr/share/rime/data") set(BRISE_FOUND FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/data/CMakeLists.txt new/fcitx-rime-0.1.2/data/CMakeLists.txt --- old/fcitx-rime-0.1.1/data/CMakeLists.txt 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/data/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 @@ -1,21 +1,3 @@ -file(GLOB PRESET_YAML "${BRISE_DIR}/preset/*.yaml") -file(GLOB SUPPLEMENT_YAML "${BRISE_DIR}/supplement/*.yaml") - -set(GEN_RIME_DATADIR "${CMAKE_CURRENT_BINARY_DIR}/_data/rime") - -add_custom_target( - data - ALL DEPENDS "${PROJECT_BINARY_DIR}/src/build_yaml" - COMMAND ${CMAKE_COMMAND} -E make_directory ${GEN_RIME_DATADIR} - COMMAND ${CMAKE_COMMAND} -E copy "${BRISE_DIR}/default.yaml" ${GEN_RIME_DATADIR} - COMMAND ${CMAKE_COMMAND} -E copy "${BRISE_DIR}/essay.kct" ${GEN_RIME_DATADIR} - COMMAND cp ${PRESET_YAML} ${GEN_RIME_DATADIR} - COMMAND cp ${SUPPLEMENT_YAML} ${GEN_RIME_DATADIR} - COMMAND cd ${GEN_RIME_DATADIR} && "${PROJECT_BINARY_DIR}/src/build_yaml" - COMMAND ${CMAKE_COMMAND} -E remove -f "${GEN_RIME_DATADIR}/rime.log" "${GEN_RIME_DATADIR}/installation.yaml" -) - -install(DIRECTORY "${GEN_RIME_DATADIR}" DESTINATION ${FCITX4_PREFIX}/share/fcitx) install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/default) install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark) install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic) Files old/fcitx-rime-0.1.1/data/zhung.png and new/fcitx-rime-0.1.2/data/zhung.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/src/CMakeLists.txt new/fcitx-rime-0.1.2/src/CMakeLists.txt --- old/fcitx-rime-0.1.1/src/CMakeLists.txt 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/src/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 @@ -11,6 +11,3 @@ fcitx_add_addon_conf_file(fcitx-rime.conf) fcitx_add_inputmethod_conf_file(rime.conf) - -add_executable(build_yaml main.c) -target_link_libraries(build_yaml ${Rime_LIBRARIES}) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/src/fcitx-rime.c new/fcitx-rime-0.1.2/src/fcitx-rime.c --- old/fcitx-rime-0.1.1/src/fcitx-rime.c 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/src/fcitx-rime.c 2012-10-04 14:34:39.000000000 +0200 @@ -38,7 +38,8 @@ if (fp) fclose(fp); FcitxXDGGetFileUserWithPrefix("rime", "", NULL, &user_path); - char* shared_data_dir = fcitx_utils_get_fcitx_path_with_filename("pkgdatadir", "rime"); + //char* shared_data_dir = fcitx_utils_get_fcitx_path_with_filename("pkgdatadir", "rime"); + const char* shared_data_dir = RIME_DATA_DIR; RimeTraits ibus_rime_traits; ibus_rime_traits.shared_data_dir = shared_data_dir; @@ -200,24 +201,40 @@ FcitxMessages* msgPreedit = FcitxInputStateGetPreedit(input); FcitxMessages* msgClientPreedit = FcitxInputStateGetClientPreedit(input); - FcitxInputStateSetShowCursor(input, false); - FcitxInputStateSetClientCursorPos(input, context.composition.cursor_pos); - FcitxMessagesAddMessageAtLast(msgPreedit, MSG_INPUT, "%s", context.composition.preedit); + FcitxInputStateSetShowCursor(input, true); + FcitxInputStateSetCursorPos(input, context.composition.cursor_pos); + if (context.commit_text_preview) { + FcitxInputStateSetClientCursorPos(input, strlen(context.commit_text_preview)); + } + /* converted text */ if (context.composition.sel_start > 0) { char* temp = strndup(context.composition.preedit, context.composition.sel_start); - FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_DONOT_COMMIT_WHEN_UNFOCUS, "%s", temp); + FcitxMessagesAddMessageAtLast(msgPreedit, MSG_OTHER, "%s", temp); free(temp); + if (context.commit_text_preview) { + temp = strndup(context.commit_text_preview, context.composition.sel_start); + FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_INPUT, "%s", temp); + free(temp); + } } + /* converting candidate */ if (context.composition.sel_start < context.composition.sel_end) { char* temp = strndup(&context.composition.preedit[context.composition.sel_start], context.composition.sel_end - context.composition.sel_start); - FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_HIGHLIGHT | MSG_DONOT_COMMIT_WHEN_UNFOCUS, "%s", temp); + FcitxMessagesAddMessageAtLast(msgPreedit, MSG_HIGHLIGHT | MSG_CODE, "%s", temp); free(temp); + if (context.commit_text_preview) { + FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_HIGHLIGHT, "%s", &context.commit_text_preview[context.composition.sel_start]); + } } - if (context.composition.sel_end > 0) { - FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_DONOT_COMMIT_WHEN_UNFOCUS, "%s", &context.composition.preedit[context.composition.sel_end]); + /* remaining input to convert */ + if (context.composition.sel_end < strlen(context.composition.preedit)) { + FcitxMessagesAddMessageAtLast(msgPreedit, MSG_CODE, "%s", &context.composition.preedit[context.composition.sel_end]); + if (context.commit_text_preview) { + FcitxMessagesAddMessageAtLast(msgClientPreedit, MSG_DONOT_COMMIT_WHEN_UNFOCUS, "%s", &context.composition.preedit[context.composition.sel_end]); + } } if (context.menu.num_candidates) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.1/src/main.c new/fcitx-rime-0.1.2/src/main.c --- old/fcitx-rime-0.1.1/src/main.c 2012-08-20 20:51:47.000000000 +0200 +++ new/fcitx-rime-0.1.2/src/main.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#include <stdlib.h> -#include <rime_api.h> - -int main(int argc, char** argv) -{ - RimeDeployerInitialize(NULL); - return RimeDeployWorkspace() ? 0 : 1; -} \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
