Merge remote-tracking branch 'main/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,7 +29,7 @@ Nếu cần thiết, hãy [đính kèm hình ảnh](https://help.github.com/arti
 **Môi trường**
  - OS và version: (ví dụ: Ubuntu 20.04)
  - Desktop: (Xfce, KDE, Gnome,... hoặc **mặc định**)
- - Phiên bản ibus-bamboo: (bản mới nhất là v0.6.5)
+ - Phiên bản ibus-bamboo: (bản mới nhất là v0.6.8)
 
 **Thông tin thêm**
 <!--

Makefile

@@ -20,7 +20,7 @@ PREFIX=/usr
 engine_name=bamboo
 ibus_e_name=ibus-engine-$(engine_name)
 pkg_name=ibus-$(engine_name)
-version=0.6.6
+version=0.6.8
 
 engine_dir=$(PREFIX)/share/$(pkg_name)
 ibus_dir=$(PREFIX)/share/ibus

archlinux/PKGBUILD-git

@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <[email protected]>
 pkgname=ibus-bamboo-git
-pkgver=0.6.6
+pkgver=0.6.8
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)

archlinux/PKGBUILD-release

@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <[email protected]>
 pkgname=ibus-bamboo
-pkgver=0.6.6
+pkgver=0.6.8
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)

bamboo.xml

@@ -22,7 +22,7 @@
     <name>org.freedesktop.IBus.bamboo</name>
     <description>Vietnamese input engine for IBus</description>
     <exec>/usr/lib/ibus-engine-bamboo --ibus</exec>
-    <version>0.6.6</version>
+    <version>0.6.8</version>
     <author>Luong Thanh Lam &lt;[email protected]&gt;</author>
     <license>GPLv3</license>
     <homepage>https://github.com/BambooEngine/ibus-bamboo/</homepage>
@@ -40,5 +40,17 @@
               <description>Vietnamese input method editor</description>
               <rank>1</rank>
           </engine>
+          <engine>
+              <symbol>vi</symbol>
+              <name>BambooUs</name>
+              <language>vi</language>
+              <license>GPLv3</license>
+              <author>Luong Thanh Lam &lt;[email protected]&gt;</author>
+              <icon>/usr/share/ibus-bamboo/viet-on.png</icon>
+              <layout>us</layout>
+              <longname>Bamboo (US layout)</longname>
+              <description>Vietnamese input method editor with US keyboard layout</description>
+              <rank>1</rank>
+          </engine>
     </engines>
 </component>

debian/changelog

@@ -1,3 +1,15 @@
+ibus-bamboo (0.6.8-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Luong Thanh Lam <[email protected]>  Sun, 29 Nov 2020 13:21:06 +0700
+
+ibus-bamboo (0.6.7-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Luong Thanh Lam <[email protected]>  Fri, 02 Oct 2020 17:21:06 +0700
+
 ibus-bamboo (0.6.6-1) stable; urgency=medium
 
   * New upstream release

debian/control

@@ -20,7 +20,7 @@ Section: utils
 Priority: extra
 Maintainer: Luong Thanh Lam <[email protected]>
 Build-Depends: debhelper, golang, libx11-dev, libxtst-dev
-Standards-Version: 0.6.6
+Standards-Version: 0.6.8
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 
 Package: ibus-bamboo

ibus-bamboo.dsc

@@ -4,12 +4,12 @@ Format: 1.0
 Source: ibus-bamboo
 Binary: ibus-bamboo
 Architecture: any
-Version: 0.6.6-0
+Version: 0.6.8-0
 Maintainer: Luong Thanh Lam <[email protected]>
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 Build-Depends: debhelper, golang, libx11-dev, libxt-dev, libxtst-dev
 Files:
- 0 0 ibus-bamboo-0.6.6.tar.gz
+ 0 0 ibus-bamboo-0.6.8.tar.gz
 
 -----BEGIN PGP SIGNATURE-----
 

ibus-bamboo.spec

@@ -4,7 +4,7 @@
 %define ibus_comp_dir /usr/share/ibus/component
 
 Name: ibus-bamboo
-Version: 0.6.6
+Version: 0.6.8
 Release: 1%{?dist}
 Summary: A Vietnamese input method for IBus
 

src/ibus-bamboo/engine.go

@@ -24,6 +24,7 @@ import (
 	"log"
 	"os/exec"
 	"reflect"
+	"strconv"
 	"sync"
 
 	"github.com/BambooEngine/bamboo-core"
@@ -52,6 +53,7 @@ type IBusBambooEngine struct {
 	emoji                  *EmojiEngine
 	isSurroundingTextReady bool
 	lastKeyWithShift       bool
+	lastCommitText         int64
 }
 
 /**
@@ -83,7 +85,7 @@ func (e *IBusBambooEngine) ProcessKeyEvent(keyVal uint32, keyCode uint32, state
 	if e.isIgnoredKey(keyVal, state) {
 		return false, nil
 	}
-	log.Printf("ProcessKeyEvent >  %c | keyCode 0x%04x keyVal 0x%04x | %d\n", rune(keyVal), keyCode, keyVal, len(keyPressChan))
+	log.Printf(">ProcessKeyEvent >  %c | keyCode 0x%04x keyVal 0x%04x | %d\n", rune(keyVal), keyCode, keyVal, len(keyPressChan))
 	if e.config.IBflags&IBinputModeLookupTableEnabled != 0 && keyVal == IBusOpenLookupTable && !e.isInputModeLTOpened && e.wmClasses != "" {
 		e.resetBuffer()
 		e.isInputModeLTOpened = true
@@ -395,7 +397,11 @@ func (e *IBusBambooEngine) PropertyActivate(propName string, propState uint32) *
 		}
 	}
 
-	var charset, foundCs = getCharsetFromPropKey(propName)
+	var im, foundIm = getValueFromPropKey(propName, "InputMode")
+	if foundIm && propState == ibus.PROP_STATE_CHECKED {
+		e.config.DefaultInputMode, _ = strconv.Atoi(im)
+	}
+	var charset, foundCs = getValueFromPropKey(propName, "OutputCharset")
 	if foundCs && isValidCharset(charset) && propState == ibus.PROP_STATE_CHECKED {
 		e.config.OutputCharset = charset
 	}