Re: dosemu-1.1.3 and Cyrillic_er

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Sergey Suleymanov wrote:
>  Grigory> looks like 'P') when in X.  Some time ago I got patch from
>  Grigory> Sergey Suleymanovor for dosemu-1.0.2 that fixes problem for
>  Grigory> 1.0.2 version. Maybe such patch exist for 1.1.3?
>         Just for 1.1.2 + Eric's patch.
I think that this Eric's patch (was in this
list: "Add koi8-r support for the russion hackers")
went in dosemu-1.1.2.8, so why not?
Or do you mean some other Eric's patch that
wasn't in this list?
And where is this glorious patch of yours?
Having a proper keymap could be very handy.

I was not reading this list for a long time so
I probably have missed something in this thread.
But as this subject is rather important for me,
I have to pick up this old message.

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

>>>>> Stas Sergeev writes:

 Stas> And where is this glorious patch of yours?  Having a proper
 Stas> keymap could be very handy.

        Well, here is it. (for 1.1.3)

-- 
  Sergey Suleymanov

[-- Attachment #2: dosemu-1.1.3rus.diff.gz --]
[-- Type: application/octet-stream, Size: 17058 bytes --]

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Sergey Suleymanov wrote:
> Stas> And where is this glorious patch of yours?  Having a proper
>  Stas> keymap could be very handy.
>         Well, here is it. (for 1.1.3)
Thanks, it works.
But one thing is strange: when I use a native
X switch (Xkb) to switch to Cyrillic, everything
works OK except the BackSpace key.
When I use a dos switch (KeyRus), everything
works OKey. So I suspect the problem is in
your patch somewhere.
For testing I wrote this prog:
---
#include <stdio.h> 
#include <bios.h> 
 
int main() { 
 for (;;) 
   printf("%i\n",bioskey(0)); 
}
---

When Xkb is in US mode, this program shows
3592 when BackSpace is pressed (KeyRus state
is irrelevant). When Xkb is in RU mode,
program shows 3711 at BackSpace, which is not
correct.
All other keys seem to work good.
Under console also everything works, the
bug triggers only in X mode.
Any ideas why this happens with BackSpace?

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Stas Sergeev wrote:
> Sergey Suleymanov wrote:
>> Stas> And where is this glorious patch of yours?  Having a proper
>>  Stas> keymap could be very handy.
>>         Well, here is it. (for 1.1.3)
> Any ideas why this happens with BackSpace?
Well, turning off X_keycode "fixes" the
problem.
Can live with this:)

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

>>>>> Stas Sergeev writes:

 >> Any ideas why this happens with BackSpace?

 Stas> Well, turning off X_keycode "fixes" the problem.  Can live with
 Stas> this:)

        Hmm, can't reproduce that :(. 3592 in both modes.

-- 
  Sergey Suleymanov

Re: dosemu-1.1.3 and Cyrillic_er

[Grigory Batalov]

On 24 Apr 2002 10:10:40 +0400
"Sergey Suleymanov" <solt@eatpbank.ru> wrote:

>  >> Any ideas why this happens with BackSpace?
> 
>  Stas> Well, turning off X_keycode "fixes" the problem.  Can live with
>  Stas> this:)
> 
>         Hmm, can't reproduce that :(. 3592 in both modes.

  Why do you prefer that patch than koi8-r from extra_charsets plugin?
  It seems working for me.

--
 Grigory Batalov.

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

>>>>> Grigory Batalov writes:

 Grigory>   Why do you prefer that patch than koi8-r from
 Grigory> extra_charsets plugin?  It seems working for me.

        That patch mostly for old non-unicode keyboard/terminal
        stuff. For the new ones it only presents rawkeyboard layout
        switcher. And a famous Cyrillic_er workaround. ;)

-- 
  Sergey Suleymanov

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

Hello.

Sergey Suleymanov wrote:
>>> Any ideas why this happens with BackSpace?
>  Stas> Well, turning off X_keycode "fixes" the problem.  Can live with
>  Stas> this:)
>         Hmm, can't reproduce that :(. 3592 in both modes.
Well, I have investigated a little more
and found that the attached patch fixes
the problem. Actually only the change to
altgr table is enough.
Does this help?
Why 127 is there?

[-- Attachment #2: keymaps.diff --]
[-- Type: text/plain, Size: 1456 bytes --]

--- src/plugin/kbd_unicode/keymaps.c	Tue Apr 23 17:32:37 2002
+++ src/plugin/kbd_unicode/keymaps.c	Wed Apr 24 16:53:09 2002
@@ -1755,7 +1755,7 @@
 CONST t_keysym key_map_ru[] =
 {
   U_VOID, 27, '1', '2', '3', '4', '5', '6',
-  '7', '8', '9', '0', '-', '=', 127, 9,
+  '7', '8', '9', '0', '-', '=', 8, 9,
   'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',
   'o', 'p', '[', ']', 13, U_VOID, 'a', 's',
   'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',
@@ -1772,7 +1772,7 @@
 CONST t_keysym shift_map_ru[] =
 {
   U_VOID, 27, '!', '@', '#', '$', '%', '^',
-  '&', '*', '(', ')', '_', '+', 127, 9,
+  '&', '*', '(', ')', '_', '+', 8, 9,
   'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I',
   'O', 'P', '{', '}', 13, U_VOID, 'A', 'S',
   'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',
@@ -1789,7 +1789,7 @@
 CONST t_keysym altgr_map_ru[] =
 {
   U_VOID, 27, '1', '2', '3', '4', '5', '6',
-  '7', '8', '9', '0', '-', '=', 127, 9,
+  '7', '8', '9', '0', '-', '=', 8, 9,
   0x439,0x446,0x443,0x43A,0x435,0x43D,0x433,0x448,0x449,0x437,0x445,0x44A,
   13, U_VOID,
   0x444,0x44B,0x432,0x430,0x43F,0x440,0x43E,0x43B,0x434,0x436,0x44D,0x451,
@@ -1807,7 +1807,7 @@
 CONST t_keysym shift_altgr_map_ru[] =
 {
   U_VOID, 27, '!', '@', '#', '$', '%', '^',
-  '&', '*', '(', ')', '_', '+', 127, 9,
+  '&', '*', '(', ')', '_', '+', 8, 9,
   0x419,0x426,0x423,0x41A,0x415,0x41D,0x413,0x428,0x429,0x417,0x425,0x42A,
   13, U_VOID,
   0x424,0x42B,0x412,0x410,0x41F,0x420,0x41E,0x41B,0x414,0x416,0x42D,0x401,

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Grigory Batalov wrote:
>   Why do you prefer that patch than koi8-r from extra_charsets plugin?
>   It seems working for me.
It works for me as well except for
typing cyrillic since there is no
"ru" keymap without this patch.
How are you getting it to understand the
cyrillic typing using a system switch?

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Grigory Batalov wrote:
>   Why do you prefer that patch than koi8-r from extra_charsets plugin?
>   It seems working for me.
It works for me as well except for
typing cyrillic since there is no
"ru" keymap without this patch.
How are you getting it to understand the
cyrillic typing using a system switch?

Re: dosemu-1.1.3 and Cyrillic_er

[Grigory Batalov]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

On Wed, 24 Apr 2002 17:13:42 +0400
"Stas Sergeev" <stssppnn@yahoo.com> wrote:

> >   Why do you prefer that patch than koi8-r from extra_charsets plugin?
> >   It seems working for me.

> It works for me as well except for
> typing cyrillic since there is no
> "ru" keymap without this patch.
> How are you getting it to understand the
> cyrillic typing using a system switch?

  There is /dosemu-1.1.3/src/plugin/extra_charsets/koi8-r.c
  Also I set
$_external_char_set = "koi8-r"
$_internal_char_set = "cp866"
  in ~/dosemu/conf/dosemurc and it works.
  Maybe you didn't enabled some plugins?  

--
 Grigory Batalov.

[-- Attachment #2: dosemu-1.1.3-plugins.patch --]
[-- Type: text/plain, Size: 1599 bytes --]

diff -ruN dosemu-1.1.2.orig/src/plugin/extra_charsets/config/plugin_enable dosemu-1.1.2/src/plugin/extra_charsets/config/plugin_enable
--- dosemu-1.1.2.orig/src/plugin/extra_charsets/config/plugin_enable	Thu Feb 28 21:47:05 2002
+++ dosemu-1.1.2/src/plugin/extra_charsets/config/plugin_enable	Thu Feb 28 21:52:37 2002
@@ -1 +1 @@
-no
+yes
diff -ruN dosemu-1.1.2.orig/src/plugin/kbd_unicode/config/plugin_enable dosemu-1.1.2/src/plugin/kbd_unicode/config/plugin_enable
--- dosemu-1.1.2.orig/src/plugin/kbd_unicode/config/plugin_enable	Thu Feb 28 21:47:05 2002
+++ dosemu-1.1.2/src/plugin/kbd_unicode/config/plugin_enable	Thu Feb 28 21:52:37 2002
@@ -1 +1 @@
-no
+yes
diff -ruN dosemu-1.1.2.orig/src/plugin/keyboard/config/plugin_enable dosemu-1.1.2/src/plugin/keyboard/config/plugin_enable
--- dosemu-1.1.2.orig/src/plugin/keyboard/config/plugin_enable	Sun Oct 28 19:48:14 2001
+++ dosemu-1.1.2/src/plugin/keyboard/config/plugin_enable	Thu Feb 28 21:52:37 2002
@@ -1 +1 @@
-yes
+no
diff -ruN dosemu-1.1.2.orig/src/plugin/term/config/plugin_enable dosemu-1.1.2/src/plugin/term/config/plugin_enable
--- dosemu-1.1.2.orig/src/plugin/term/config/plugin_enable	Thu Feb 28 21:47:05 2002
+++ dosemu-1.1.2/src/plugin/term/config/plugin_enable	Thu Feb 28 21:52:37 2002
@@ -1 +1 @@
-no
+yes
diff -ruN dosemu-1.1.2.orig/src/plugin/translate/config/plugin_enable dosemu-1.1.2/src/plugin/translate/config/plugin_enable
--- dosemu-1.1.2.orig/src/plugin/translate/config/plugin_enable	Thu Feb 28 21:47:05 2002
+++ dosemu-1.1.2/src/plugin/translate/config/plugin_enable	Thu Feb 28 21:52:37 2002
@@ -1 +1 @@
-no
+yes

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

>>>>> Stas Sergeev writes:

 Stas> Well, I have investigated a little more and found that the
 Stas> attached patch fixes the problem. Actually only the change to
 Stas> altgr table is enough.  

        Actually only these are needed at all. ;)

 Stas> Does this help?  Why 127 is there?

        I presume this is ^?. Anyway, ^H also works. Thanks.

-- 
  Sergey Suleymanov

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

>>>>> Grigory Batalov writes:

 >> It works for me as well except for typing cyrillic since there is
 >> no "ru" keymap without this patch.  How are you getting it to
 >> understand the cyrillic typing using a system switch?

 Grigory>   There is /dosemu-1.1.3/src/plugin/extra_charsets/koi8-r.c
 Grigory> Also I set $_external_char_set = "koi8-r"
 Grigory> $_internal_char_set = "cp866" in ~/dosemu/conf/dosemurc and
 Grigory> it works. 

        As the Alt+keypad sequences.

-- 
  Sergey Suleymanov

Re: dosemu-1.1.3 and Cyrillic_er

[Grigory Batalov]

On 24 Apr 2002 18:39:32 +0400
"Sergey Suleymanov" <solt@eatpbank.ru> wrote:

>  >> It works for me as well except for typing cyrillic since there is
>  >> no "ru" keymap without this patch.  How are you getting it to
>  >> understand the cyrillic typing using a system switch?
> 
>  Grigory>   There is /dosemu-1.1.3/src/plugin/extra_charsets/koi8-r.c
>  Grigory> Also I set $_external_char_set = "koi8-r"
>  Grigory> $_internal_char_set = "cp866" in ~/dosemu/conf/dosemurc and
>  Grigory> it works. 
> 
>         As the Alt+keypad sequences.

   Is it bad? =)

-- 
 Grigory Batalov.

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]

Hello.

Sergey Suleymanov wrote:
> Stas> altgr table is enough.  
>         Actually only these are needed at all. ;)
But in fact this means that the problem
is still there.
The problem is that normally altgr map is
similar to the alt map, so the special keycodes
in it are mapped as for the alt map.
But you are reserving altgr map for Cyrillic,
so it must be treated as a plain map.
And for the plain map, the BackSpace keycode
gets altered back to 8, see init_misc_plain_map()
and init_misc_shifted_map().
So I think that the real fix would be something
like the attached patch.

> Stas> Does this help?  Why 127 is there?
>         I presume this is ^?. Anyway, ^H also works. Thanks.
Actually I think it is a bios keycodes, so it
must be 8. Which is done with the attached patch
and no need to modify the keymaps at all.
This patch also fixes some other small
problems with ctrl and alt modifiers in
cyrillic mode.
Does this look like a correct fix to you?
And of course the root of the problem
seems to be that dosemu currently doesn't
natively support the layout switching.

[-- Attachment #2: serv_xlat.diff --]
[-- Type: text/plain, Size: 1017 bytes --]

--- src/plugin/kbd_unicode/serv_xlat.c	Tue Apr 23 17:32:37 2002
+++ src/plugin/kbd_unicode/serv_xlat.c	Thu Apr 25 13:53:46 2002
@@ -361,11 +361,11 @@
 }
 static void init_misc_altgr_map(t_keysym *rule)
 {
-	rule[NUM_SPACE] = KEY_SPACE;
+	init_misc_plain_map(rule);
 }
 static void init_misc_shift_altgr_map(t_keysym *rule)
 {
-	rule[NUM_SPACE] = KEY_SPACE;
+	init_misc_shifted_map(rule);
 }
 static void init_misc_ctrl_alt_map(t_keysym *rule)
 {
@@ -1134,10 +1134,11 @@
 	if ((shiftstate & ANY_ALT) && (shiftstate & ANY_CTRL)) {
 		ch = state->rules->map.ctrl_alt[key];
 	}
-  else if ((shiftstate & (R_ALT|ALTGR_LOCK)) && (shiftstate & ANY_SHIFT)) {
+	else if ((shiftstate & ALTGR_LOCK) && (shiftstate & ANY_SHIFT) &&
+	    !(shiftstate & (ANY_CTRL | ANY_ALT))) {
 		ch = state->rules->map.shift_altgr[key];
 	}
-  else if (shiftstate & (R_ALT|ALTGR_LOCK)) {
+	else if ((shiftstate & ALTGR_LOCK) && !(shiftstate & (ANY_CTRL | ANY_ALT))) {
 		ch = state->rules->map.altgr[key];
 	}
 	else if (shiftstate & ANY_ALT) {

Re: dosemu-1.1.3 and Cyrillic_er

[Stas Sergeev]

Hello.

Grigory Batalov wrote:
>>  Grigory> Also I set $_external_char_set = "koi8-r"
>>  Grigory> $_internal_char_set = "cp866" in ~/dosemu/conf/dosemurc and
>>  Grigory> it works. 
>>         As the Alt+keypad sequences.
>    Is it bad? =)
Are you sure that you are using a
*system* switch (xrus, xxkb) rather
than a dos' switch (keyrus, keyb.com)?
Because dos's switch works under xdos
also without Sergey's patch, but not the
system switch.
And if yes, then how are you setting the
$_layout option?
Cause I don't think you can set it to
"ru" without a Sergey's patch.

Re: dosemu-1.1.3 and Cyrillic_er

[Grigory Batalov]

On Thu, 25 Apr 2002 23:29:24 +0400
"Stas Sergeev" <stssppnn@yahoo.com> wrote:

> >>  Grigory> Also I set $_external_char_set = "koi8-r"
> >>  Grigory> $_internal_char_set = "cp866" in ~/dosemu/conf/dosemurc and
> >>  Grigory> it works. 
> >>         As the Alt+keypad sequences.
> >    Is it bad? =)

> Are you sure that you are using a
> *system* switch (xrus, xxkb) rather
> than a dos' switch (keyrus, keyb.com)?

    I use XFree86-4.2.0 and WindowMaker-0.80, no xxkb
  (or where it is?). Switchers are (left/right) Ctrl-Shift.
  Same in console.
    This combination works without any keyrus.com or something
  in autoexec.bat since Eric Biederman made patch for
  dosemu-1.1.2.7:

-----------------------------------------------------
Begin forwarded message:

Date: 20 Jan 2002 15:03:54 -0700
From: "Eric W. Biederman" <ebiederm@xmission.com>
To: "bATALOW gRIGORIJ" <bga@kgok.murmansk.su>
Subject: Re: Locale settings in dosemu-1.0.2


"bATALOW gRIGORIJ" <bga@kgok.murmansk.su> writes:
<skip>

>   Also console seems not to supporting locale.
>  It doesn't show russian nor allow to put it in.

For $_console = (1) $_graphics=(1) this should work exactly as
with normal dos.

For terminals support was just added in the development version.
dosemu-1.1.2.7 supports this but doesn't have support for koi8-r

The attached file add basic support for displaying russian in terminals.
comment out $_term_char_set
Set 
$_internal_char_set="cp866"
$_external_char_set="koi8-r-safe" (which should work on all terminals)
$_external_char_set="koi8-r" (This gives garbage on some terminals)
-----------------------------------------------------
 (patch is already implemented in 1.1.3)

"Stas Sergeev" <stssppnn@yahoo.com> wrote:

> Because dos's switch works under xdos
> also without Sergey's patch, but not the
> system switch.

  I use dosemu-1.1.3 and start it as xdosemu.
  But dosemu in console also works the same way.

> And if yes, then how are you setting the
> $_layout option?

  $_layout = "auto"

> Cause I don't think you can set it to
> "ru" without a Sergey's patch.

  I use it with dosemu-1.0.1 and -1.0.2.

-- 
 Grigory Batalov.

Re: dosemu-1.1.3 and Cyrillic_er

[Sergey Suleymanov]

>>>>> Stas Sergeev writes:

 Stas> But in fact this means that the problem is still there.  The
 Stas> problem is that normally altgr map is similar to the alt map,
 Stas> so the special keycodes in it are mapped as for the alt map.
 Stas> But you are reserving altgr map for Cyrillic, so it must be
 Stas> treated as a plain map.  

        Maybe having separate keymaps would be more correctly. As for
        non-unicode keymaps.

 Stas> This patch also fixes some other small problems with ctrl and
 Stas> alt modifiers in cyrillic mode.  

        I think this is needed too.

--- serv_xlat.c.orig    Fri Apr 26 14:58:38 2002
+++ serv_xlat.c Fri Apr 26 15:12:22 2002
@@ -705,8 +705,8 @@
        init_charset_keymap(charset, map->shift, MODIFIER_SHIFT); 
        init_charset_keymap(charset, map->ctrl, MODIFIER_CTRL);
        init_charset_keymap(charset, map->alt, MODIFIER_ALT);
-       init_charset_keymap(charset, map->altgr, MODIFIER_ALTGR);
-       init_charset_keymap(charset, map->shift_altgr, MODIFIER_SHIFT | MODIFIER_ALTGR);
+       init_charset_keymap(charset, map->altgr, 0);
+       init_charset_keymap(charset, map->shift_altgr, MODIFIER_SHIFT);
        init_charset_keymap(charset, map->ctrl_alt, MODIFIER_CTRL | MODIFIER_ALT);

        or better this

--- serv_xlat.c.orig    Fri Apr 26 14:58:38 2002
+++ serv_xlat.c Fri Apr 26 15:12:22 2002
@@ -1707,7 +1709,7 @@
        struct key_pressed_state *keys = &state->keys_pressed;
 
        /* altgr implies alt */
-       if (desired & MODIFIER_ALTGR)   desired |= MODIFIER_ALT;
+//     if (desired & MODIFIER_ALTGR)   desired |= MODIFIER_ALT;
 
        /* To keep some bits constant copy them from state->shiftstate into 
         * desired.

 Stas> Does this look like a correct fix to you?  

        Quite correct I think.

 Stas> And of course the root of the problem seems to be that dosemu
 Stas> currently doesn't natively support the layout switching.

-- 
  Sergey Suleymanov