add emoji.src

gtk/main.c

@@ -158,15 +158,19 @@ getpreedit(GtkIMContext *ctx, gchar **str, PangoAttrList **attrs,
 	PangoAttribute *u;
 
 	im = (Im*)ctx;
-	*str = g_strdup(im->pre);
+	if(str)
-	*attrs = pango_attr_list_new();
+		*str = g_strdup(im->pre);
-	if(im->prelen > 0){
+	if(attrs){
-		u = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+		*attrs = pango_attr_list_new();
-		u->start_index = 0;
+		if(im->prelen > 0){
-		u->end_index = im->prelen;
+			u = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-		pango_attr_list_insert(*attrs, u);
+			u->start_index = 0;
+			u->end_index = im->prelen;
+			pango_attr_list_insert(*attrs, u);
+		}
 	}
-	*cursor_pos = g_utf8_strlen(im->pre, -1);
+	if(cursor_pos)
+		*cursor_pos = g_utf8_strlen(im->pre, -1);
 }
 
 static void

ko.c

@@ -203,7 +203,6 @@ transko(Im *im, Rune c)
 			e.s = im->pre;
 			sclear(&im->pre);
 		}
-		sputr(&e.s, c);
 		return e;
 	}
 

map/emoji.dict

@@ -1,179 +0,0 @@
-!	⚠ ≠
-!!	⚠
-!=	≠
-*	★
-**	★
-+	±
-+-	±
--	→
-->	→
-.	· … ÷
-..	· …
-...	…
-./	÷
-:	☹ ☺
-:(	☹
-:)	☺
-<	← ≤ ≠ ♥
-<-	←
-<=	≤
-<>	≠
-=	≡ ⇒
-==	≡
-=>	⇒
->	≥
->=	≥
-^	⁽ ⁾ ⁺ ⁻ ⁼ ⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹ ⁱ ⁿ
-^(	⁽
-^)	⁾
-^+	⁺
-^-	⁻
-^=	⁼
-_	₍ ₎ ₊ ₋ ₌ ₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ₐ ₑ ₒ ₓ
-_(	₍
-_)	₎
-_+	₊
-_-	₋
-_=	₌
-~	≈
-~=	≈
-^0	⁰
-_0	₀
-^1	¹
-_1	₁
-^2	²
-_2	₂
-<3	♥
-^3	³
-_3	₃
-^4	⁴
-_4	₄
-^5	⁵
-_5	₅
-^6	⁶
-_6	₆
-^7	⁷
-_7	₇
-^8	⁸
-_8	₈
-^9	⁹
-_9	₉
-_a	ₐ
-a	α
-al	α
-alp	α
-alph	α
-alpha	α
-b	β
-be	β
-bet	β
-beta	β
-c	χ
-ch	χ
-chi	χ
-d	° δ ↓
-D	Δ
-de	° δ
-De	Δ
-deg	°
-del	δ
-delt	δ
-delta	δ
-dn	↓
-_e	ₑ
-e	ε η
-ep	ε
-eps	ε
-et	η
-eta	η
-g	γ
-G	Γ
-ga	γ
-Ga	Γ
-gam	γ
-gamm	γ
-gamma	γ
-^i	ⁱ
-i	∞ ι
-I	∫
-II	∫
-in	∞
-inf	∞
-io	ι
-iot	ι
-iota	ι
-k	κ
-ka	κ
-kap	κ
-kapp	κ
-kappa	κ
-l	λ
-L	Λ
-la	λ
-La	Λ
-lam	λ
-lamb	λ
-lambd	λ
-lambda	λ
-m	× μ
-mu	× μ
-mul	×
-^n	ⁿ
-n	ν
-nu	ν
-_o	ₒ
-o	ω ●
-O	Ω
-om	ω
-Om	Ω
-ome	ω
-omeg	ω
-omega	ω
-oo	●
-p	φ π ψ
-P	Φ Π ∏ Ψ
-ph	φ
-Ph	Φ
-phi	φ
-pi	π
-Pi	Π
-PP	∏
-ps	ψ
-Ps	Ψ
-psi	ψ
-r	ρ
-rh	ρ
-rho	ρ
-s	σ √
-S	Σ ∑
-si	σ
-Si	Σ
-sig	σ
-sigm	σ
-sigma	σ
-sq	√
-SS	∑
-t	τ θ
-T	Θ
-ta	τ
-tau	τ
-th	θ
-Th	Θ
-the	θ
-thet	θ
-theta	θ
-u	↑ υ
-up	↑ υ
-ups	υ
-v	✓
-vv	✓
-_x	ₓ
-x	ξ ✗
-X	Ξ
-xi	ξ
-Xi	Ξ
-xx	✗
-z	ζ
-ze	ζ
-zet	ζ
-zeta	ζ

map/emoji.map

@@ -16,6 +16,7 @@
 :)	☺
 <	<
 <-	←
+<3	♥
 <=	≤
 <>	≠
 =	=
@@ -23,42 +24,66 @@
 =>	⇒
 >	>
 >=	≥
+D	D
+De	Δ
+G	G
+Ga	Γ
+I	I
+II	∫
+L	L
+La	Λ
+O	O
+Om	Ω
+P	P
+PP	∏
+Ph	Φ
+Pi	Π
+Ps	Ψ
+S	S
+SS	∑
+Si	Σ
+T	T
+Th	Θ
+X	X
+Xi	Ξ
 ^	^
 ^(	⁽
 ^)	⁾
 ^+	⁺
 ^-	⁻
+^0	⁰
+^1	¹
+^2	²
+^3	³
+^4	⁴
+^5	⁵
+^6	⁶
+^7	⁷
+^8	⁸
+^9	⁹
 ^=	⁼
+^i	ⁱ
+^n	ⁿ
 _	_
 _(	₍
 _)	₎
 _+	₊
 _-	₋
-_=	₌
-~	~
-~=	≈
-^0	⁰
 _0	₀
-^1	¹
 _1	₁
-^2	²
 _2	₂
-<3	♥
-^3	³
 _3	₃
-^4	⁴
 _4	₄
-^5	⁵
 _5	₅
-^6	⁶
 _6	₆
-^7	⁷
 _7	₇
-^8	⁸
 _8	₈
-^9	⁹
 _9	₉
+_=	₌
 _a	ₐ
+_e	ₑ
+_o	ₒ
+_x	ₓ
 a	a
 al	al
 alp	alp
@@ -72,31 +97,27 @@ c	c
 ch	ch
 chi	χ
 d	d
-D	D
 de	de
-De	Δ
 deg	°
 del	del
 delt	delt
 delta	δ
 dn	↓
-_e	ₑ
 e	e
 ep	ep
 eps	ε
 et	et
 eta	η
+f	f
+fu	fu
+fuc	fuc
+fuck	凸
 g	g
-G	G
 ga	ga
-Ga	Γ
 gam	gam
 gamm	gamm
 gamma	γ
-^i	ⁱ
 i	i
-I	I
-II	∫
 in	in
 inf	∞
 io	io
@@ -108,9 +129,7 @@ kap	kap
 kapp	kapp
 kappa	κ
 l	l
-L	L
 la	la
-La	Λ
 lam	lam
 lamb	lamb
 lambd	lambd
@@ -118,47 +137,33 @@ lambda	λ
 m	m
 mu	μ
 mul	×
-^n	ⁿ
 n	n
 nu	ν
-_o	ₒ
 o	o
-O	O
 om	om
-Om	Ω
 ome	ome
 omeg	omeg
 omega	ω
 oo	●
 p	p
-P	P
 ph	ph
-Ph	Φ
 phi	φ
 pi	π
-Pi	Π
-PP	∏
 ps	ps
-Ps	Ψ
 psi	ψ
 r	r
 rh	rh
 rho	ρ
 s	s
-S	S
 si	si
-Si	Σ
 sig	sig
 sigm	sigm
 sigma	σ
 sq	√
-SS	∑
 t	t
-T	T
 ta	ta
 tau	τ
 th	th
-Th	Θ
 the	the
 thet	thet
 theta	θ
@@ -167,13 +172,12 @@ up	↑
 ups	υ
 v	v
 vv	✓
-_x	ₓ
 x	x
-X	X
 xi	ξ
-Xi	Ξ
 xx	✗
 z	z
 ze	ze
 zet	zet
 zeta	ζ
+~	~
+~=	≈

map/emoji.src

@@ -57,6 +57,7 @@ dn	↓
 _e	ₑ
 eps	ε
 eta	η
+fuck	凸
 gamma	γ
 Ga	Γ
 ^i	ⁱ

run.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
+cd "$(dirname "$0")"
 pkill strans
-pkill strans-xim
-
 sleep 1
 ./strans map font &
 sleep 1

strans.c

@@ -185,10 +185,8 @@ transmap(Im *im, Rune c)
 		e.s = im->pre;
 	sclear(&key);
 	sputr(&key, c);
-	if(!maplookup(t, &key, &e.dict)){
+	if(!maplookup(t, &key, &e.dict))
-		sputr(&e.s, c);
 		return e;
-	}
 	e.eat = 1;
 	sputr(&e.next, c);
 	return e;
@@ -273,14 +271,16 @@ keystroke(u32int ks, u32int mod, Str *com)
 		return 1;
 	}
 	if(ks > 0x7f || ks == ' '){
+		if(im.pre.n == 0)
+			return 0;
 		commit(com);
 		sputr(com, ks);
 		reset();
 		return 1;
 	}
-	dotrans(ks, com);
+	n = dotrans(ks, com);
 	show();
-	return 1;
+	return n;
 }
 
 static void

vi.c

@@ -101,10 +101,8 @@ transvi(Im *im, Rune c)
 		return transmap(im, c);
 
 	memset(&e, 0, sizeof e);
-	if(im->pre.n == 0){
+	if(im->pre.n == 0)
-		sputr(&e.s, c);
 		return e;
-	}
 	if(im->pre.r[im->pre.n - 1] == '\\'){
 		pre = im->pre;
 		pre.n--;