Skip to content

Commit

Permalink
* doc/en/README.win32, doc/ja/README.win32: Updated.
Browse files Browse the repository at this point in the history
* im_kbd.c: Add "es" and "pt" to kbd_type_tbl.
  • Loading branch information
arakiken committed Nov 25, 2023
1 parent 0f79836 commit c81bdde
Show file tree
Hide file tree
Showing 6 changed files with 1,237 additions and 1,251 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2023-11-25 Araki Ken <arakiken@users.sf.net>

* doc/en/README.win32, doc/ja/README.win32: Updated.

* im_kbd.c: Add "es" and "pt" to kbd_type_tbl.

2023-11-21 Araki Ken <arakiken@users.sf.net>

* ui_main_config.c: Add --winsize / output_xtwinops_in_resizing option.
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ mingw*)
;;

msys*)
# msys2
# msys2
AC_CHECK_PROG(CYGPATHW,cygpath,cygpath -w,echo)
WIN32TAG=_win32

Expand Down
43 changes: 12 additions & 31 deletions doc/en/README.win32
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,19 @@ Memo about WIN32 native GUI.

* Build
(PKG_CONFIG=i686-w64-mingw32-pkg-config CC=i686-pc-mingw32-gcc) ./configure \
(--enable-ssh2) (--with-gui=win32) (--config-cache) (--prefix=) \
--with-gui=win32 --prefix= (--prefix=/mingw64) (--disable-ssh2) \
(--with-mosh=[mosh source directory]) \
(--with-libintl-prefix=[GTK+(win32) installed directory]) \
(--with-libiconv-prefix=[GTK+(win32) installed directory])
make
(DESTDIR=/foo/bar) make install

If 'make install' fails, copy these files to a directory where you want to
install mlterm.
baselib/src/.libs/*.dll
encodefilter/src/.libs/*.dll
encodefilter/module/.libs/*.dll
vtemu/.libs/*.dll
vtemu/libctl/.libs/*.dll
main/.libs/mlterm.exe
scrollbar/sample/.libs/*.dll
inputmethod/kbd/.libs/*.dll
libind/.libs/*.dll
tool/mlimgloader/.libs/mlimgloader.exe

o (Built with MinGW)
If you build mlterm without libssh2 (--enable-ssh2 configure option),
copy win32/plink/plink.exe which mlterm uses to connect remote host.
o (Built with MSYS or cygwin)
Copy tool/mlclient/mlclient.exe and contrib/tool/mlcc/mlcc.exe.
o If you can build mlconfig and mlterm-menu which require GTK+ >= 2.0,
copy tool/mlconfig/.libs/mlconfig.exe and
contrib/tool/mlterm-menu/.libs/mlterm-menu.exe, too.

* Configuration
(Built with MSYS-DTK or MSYS2 or Cygwin)
Place configuration files in SYSCONFDIR/mlterm and each user's $HOME/.mlterm/
directory.

(Built with MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc etc))
(Built with MinGW)
Place configuration files in [Mlterm installed directory]\mlterm\ and
each user's %HOMEPATH%\mlterm\ or %HOME%\.mlterm\ directory.

Expand All @@ -56,19 +35,21 @@ Memo about WIN32 native GUI.
aafont, vaafont, taafont files are not used.

(Encoding)
If -E/--km/encoding option is "AUTO" or not specified, encoding of mlterm
is set as follows.
Built with MSYS-DTK or MSYS2 or Cygwin => UTF-8
Built with MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc etc)
=> Conforming with windows codepage.

If -E/--km/encoding option is "AUTO" or not specified, mlterm uses UTF-8
encoding by default.

(ConPTY)
mlterm starts cmd.exe via ConPTY if it doesn't use ssh or mosh.
If you want to make mlterm use pipe instead of ConPTY to communicate
with a child process, add "use_conpty=false" to main configuration file.

* Start
(Built with MSYS-DTK or MSYS2 or Cygwin)
set HOME=c:\msys\...\home\...
set CYGWIN=tty
mlterm.exe (options...) -e /bin/sh --login -i

(Built with MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc etc))
(Built with MinGW)
set HOMEPATH=...
mlterm.exe (options...) (-e plink.exe [-telnet/-ssh/-rlogin/-raw] [host])

Expand Down
4 changes: 3 additions & 1 deletion doc/en/ReleaseNote
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
* Support "exesel:" operation in ~/.mlterm/key in win32.
* Support libvte compatible library in win32.
* Support ConPTY in win32.
* Add --conpty/use_conpty option.
* Add --conpty/use_conpty and --winsize/output_xtwinops_in_resizing options in win32.
* Add tool/accessories/applycfg.sh and applyfontcfg.sh
(https://github.com/arakiken/mlterm/issues/71)
* Add "de", "fr", "es", "pt" and "jp106" to available values for "kbd"
input method argument.
* Update unicode property table (generated from UnicodeData.txt and
EastAsianWidth.txt) to version 15.1.0.
* Merge patches:
Expand Down
52 changes: 14 additions & 38 deletions doc/ja/README.win32
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
comment -*- mode: text; tab-width:2; indent-tabs-mode:nil; coding:euc-jp -*-

WIN32 native GUI �б��˴ؤ�����
Windows GDI �б��˴ؤ�����

* �ƥ��ȴĶ�
MS Windows 10 + MSYS2 3.1.7 or Cygwin 3.4.3
Expand All @@ -9,52 +9,27 @@ WIN32 native GUI

* �ӥ��
(PKG_CONFIG=i686-w64-mingw32-pkg-config CC=i686-pc-mingw32-gcc) ./configure \
(--enable-ssh2) (--with-gui=win32) (--config-cache) (--prefix=) \
--with-gui=win32 --prefix= (--prefix=/mingw64) (--disable-ssh2) \
(--with-mosh=[mosh source directory]) \
(--with-libintl-prefix=[GTK+(win32) installed directory]) \
(--with-libiconv-prefix=[GTK+(win32) installed directory])
make
(DESTDIR=/foo/bar) make install

�⤷��make install �����Ԥ�����ϡ����󥹥ȡ��뤷�����ǥ��쥯�ȥ�ˡ�
baselib/src/.libs/*.dll
encodefilter/src/.libs/*.dll
encodefilter/module/.libs/*.dll
vtemu/.libs/*.dll
vtemu/libctl/.libs/*.dll
main/.libs/mlterm.exe
scrollbar/sample/.libs/*.dll
inputmethod/kbd/.libs/*.dll
libind/.libs/*.dll
tool/mlimgloader/.libs/mlimgloader.exe
�򥳥ԡ����Ƥ���������

* configure ���ץ����
--with-gui=(xlib|win32)
GUI �饤�֥��Ȥ��� xlib �� API ����Ѥ��뤫 win32 �� API �����
���뤫����ꤷ�ޤ���
���Υ��ץ���󤬻��ꤵ��ʤ���硢MSYS �Ķ��Ǥ� win32 ��Ƚ�Ǥ���
CYGWIN �Ķ��Ǥ� X �����󥹥ȡ��뤵��Ƥ���� xlib �ȡ�X ������
�ȡ��뤵��Ƥ��ʤ���� win32 ��Ƚ�Ǥ��ޤ���

* ���󥹥ȡ���
o MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc �ʤ�) �� --enable-ssh2
�ʤ��ǥӥ�ɤ������ϡ�win32/plink/plink.exe �⥳�ԡ����Ƥ���������
libssh2 ����Ѥ��ʤ���硢��⡼�ȥۥ��Ȥؤ���³�ˤ� plink.exe ����Ѥ��ޤ���
o MSYS-DTK or MSYS2 or Cygwin �ǥӥ�ɤ������ϡ��������ĥ꡼��
contrib/tool/mlcc/mlcc.exe, tool/mlclient/mlclient.exe �⥳�ԡ����Ƥ���������
o mlconfig,mlterm-menu ��ӥ�ɤǤ������(���餫���� GTK+ >= 2.0 �򥤥󥹥ȡ�
�뤷�Ƥ���ɬ�פ�����ޤ�)�ϡ��������ĥ꡼��
tool/mlconfig/.libs/mlconfig.exe
contrib/tool/mlterm-menu/.libs/mlterm-menu.exe
�⥳�ԡ����Ƥ���������
���Υ��ץ���󤬻��ꤵ��ʤ���硢X �����󥹥ȡ��뤵��Ƥ���� xlib �ȡ�
X �����󥹥ȡ��뤵��Ƥ��ʤ���� win32 ��Ƚ�Ǥ��ޤ���

* �Ķ�����
(MSYS-DTK or MSYS2 or Cygwin �ǥӥ�ɤ������)
SYSCONFDIR/mlterm �ڤӳƥ桼�����Ȥ� $HOME/.mlterm/ �ʲ�������ե�����
(�������ĥ꡼�� etc/ �ʲ��Υե�����)�����֤��뤳�Ȥˤ��Ķ������Ԥ����Ȥ�
�Ǥ��ޤ���

(MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc �ʤ�) �ǥӥ�ɤ������)
(MinGW �ǥӥ�ɤ������)
[mlterm �����󥹥ȡ��뤵�줿�ǥ��쥯�ȥ�]\mlterm\ �ڤӳƥ桼�����Ȥ�
%HOMEPATH%\mlterm\ (%HOMEPATH% ��¸�ߤ��ʤ��ǥ��쥯�ȥ�ξ��� %HOME%\.mlterm\)
�ʲ�������ե�����(�������ĥ꡼�� etc/ �ʲ��Υե�����) �����֤��뤳�Ȥˤ��
Expand All @@ -69,9 +44,12 @@ WIN32 native GUI

(���󥳡��ǥ���)
-E/--km/encoding ���ץ����� AUTO ���������Ʊ���ץ�������ꤷ�ʤ���
�����ˤ����륨�󥳡��ǥ��󥰤ϡ�MSYS-DTK or MSYS2 or Cygwin �ǥӥ�ɤ������
�� UTF-8��MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc �ʤ�) �ǥӥ��
�������ˤ� Windows �� CodePage���б��������󥳡��ǥ��󥰤Ȥʤ�ޤ���
�����ˤ����륨�󥳡��ǥ��󥰤ϡ�UTF-8 �Ȥʤ�ޤ���

(ConPTY)
MinGW �ǤǤϡ�ssh ���� mosh �����Ѥ��ʤ���硢ConPTY �� cmd.exe ��ư���ޤ���
ConPTY ����Ѥ�����ñ�� pipe �ǻҥץ��������̿����������ϡ�main ����ե�����
�ˤ����ơ�use_conpty=false �����ꤷ�Ƥ���������

* ��ư��ˡ
���ޥ�ɥץ���ץ������鼡�ΤȤ��굯ư
Expand All @@ -82,7 +60,7 @@ WIN32 native GUI
set CYGWIN=tty
mlterm.exe (options...) -e /bin/sh --login -i

(MinGW or Cygwin(gcc -mno-cygwin, i686-pc-mingw32-gcc �ʤ�) �ǥӥ�ɤ������)
(MinGW �ǥӥ�ɤ������)
set HOMEPATH=...
mlterm.exe (options...) (-e plink.exe [-telnet/-ssh/-rlogin/-raw] [host])
�� -e ���ץ�������ꤷ�ʤ���硢��ư���ˡ���³���륵���С��ץ��ȥ��롢
Expand Down Expand Up @@ -121,10 +99,8 @@ WIN32 native GUI
o utmp �Ͼ��̵���Ȥʤ�ޤ���

* ������������
o USE_WIN32API�ޥ���: MinGW ���� CYGWIN(gcc -mno-cygwin, i686-pc-mingw32-gcc
�ʤ�) �ǥӥ�ɤ���ݤ� define ����ޤ���
o USE_WIN32API�ޥ���: MinGW �ǥӥ�ɤ���ݤ� define ����ޤ���
o USE_WIN32GUI�ޥ���: --with-gui=win32 �ξ�� define ����ޤ���
o �ե�����̾ *_win32.c: --with-gui=win32 �ξ��� compile ����ޤ���

* α�ջ���
o MSYS-DTK 1.0.1 �˴ޤޤ�� winuser.h / libuser32.a �ϸŤ����ᡢ
Expand Down
Loading

0 comments on commit c81bdde

Please sign in to comment.