Attachment 111423 Details for Bug 138191 – Patch fixing tthe described inconcistencies

[patch] Patch fixing tthe described inconcistencies

kdebase-3.3.2-konsole-keymap.patch (text/plain), 16.46 KB, created by Hans de Goede on 2005-02-25 15:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2005-02-25 15:07:00 UTC

Size: 16.46 KB

patch

obsolete

>--- kdebase-3.3.2/konsole/other/README.default.Keytab.konsole-keymap	2004-05-26 23:46:38.000000000 +0200
>+++ kdebase-3.3.2/konsole/other/README.default.Keytab	2005-02-25 09:36:13.000000000 +0100
>@@ -36,81 +36,85 @@
> 
> key Return-Shift-NewLine : "\r"
> key Return-Shift+NewLine : "\r\n"
>-
> key Return+Shift         : "\EOM"
> 
>-# Backspace and Delete codes are preserving CTRL-H.
>+# Backspace and Delete codes follow the REAL xterm and official xterm ncurses
>+# thus Backspace = CTRL-H
> 
>-key Backspace      : "\x7f"
>+key Backspace        : "\x08"
> 
>-# Arrow keys in VT52 mode
>+# Arrow keys in VT52 mode, note shift up/down are reserved for scrolling
> 
> key Up   -Shift-Ansi : "\EA"
> key Down -Shift-Ansi : "\EB"
>-key Right-Shift-Ansi : "\EC"
>-key Left -Shift-Ansi : "\ED"
>+key Right      -Ansi : "\EC"
>+key Left       -Ansi : "\ED"
> 
> # Arrow keys in ANSI mode with Application - and Normal Cursor Mode)
> 
>-key Up   -Shift+Ansi+AppCuKeys : "\EOA"
>-key Down -Shift+Ansi+AppCuKeys : "\EOB"
>-key Right-Shift+Ansi+AppCuKeys : "\EOC"
>-key Left -Shift+Ansi+AppCuKeys : "\EOD"
>-
>-key Up   -Shift+Ansi-AppCuKeys : "\E[A"
>-key Down -Shift+Ansi-AppCuKeys : "\E[B"
>-key Right-Shift+Ansi-AppCuKeys : "\E[C"
>-key Left -Shift+Ansi-AppCuKeys : "\E[D"
>+key Up    -Shift-AnyMod+Ansi+AppCuKeys : "\EOA"
>+key Down  -Shift-AnyMod+Ansi+AppCuKeys : "\EOB"
>+key Right       -AnyMod+Ansi+AppCuKeys : "\EOC"
>+key Left        -AnyMod+Ansi+AppCuKeys : "\EOD"
>+
>+key Up    -Shift-AnyMod+Ansi-AppCuKeys : "\E[A"
>+key Down  -Shift-AnyMod+Ansi-AppCuKeys : "\E[B"
>+key Right       -AnyMod+Ansi-AppCuKeys : "\E[C"
>+key Left        -AnyMod+Ansi-AppCuKeys : "\E[D"
>+
>+key Up    -Shift+AnyMod+Ansi           : "\E[1;*A"
>+key Down  -Shift+AnyMod+Ansi           : "\E[1;*B"
>+key Right       +AnyMod+Ansi           : "\E[1;*C"
>+key Left        +AnyMod+Ansi           : "\E[1;*D"
> 
> # other grey PC keys
> 
> key Enter+NewLine : "\r\n"
> key Enter-NewLine : "\r"
> 
>-key Home  -Shift-AppCuKeys : "\E[H"  
>-key End   -Shift-AppCuKeys : "\E[F"  
>-key Home  +Shift-AppCuKeys : "\E[2H"  
>-key End   +Shift-AppCuKeys : "\E[2F"  
>-
>-key Home  -Shift+AppCuKeys : "\EOH"  
>-key End   -Shift+AppCuKeys : "\EOF"  
>-key Home  +Shift+AppCuKeys : "\EO2H"  
>-key End   +Shift+AppCuKeys : "\EO2F"  
>-
>-key Insert-Shift : "\E[2~"  
>-key Delete-Shift : "\E[3~"  
>-key Prior -Shift : "\E[5~"  
>-key Next  -Shift : "\E[6~"  
>-
>-key Delete+Shift : "\E[3;2~"  
>-
>-# Function keys w/o Shift modifier
>-
>-key F1    -Shift   : "\EOP"
>-key F2    -Shift   : "\EOQ"
>-key F3    -Shift   : "\EOR"
>-key F4    -Shift   : "\EOS"
>-key F5    -Shift   : "\E[15~"
>-key F6    -Shift   : "\E[17~"
>-key F7    -Shift   : "\E[18~"
>-key F8    -Shift   : "\E[19~"
>-key F9    -Shift   : "\E[20~"
>-key F10   -Shift   : "\E[21~"
>-key F11   -Shift   : "\E[23~"
>-key F12   -Shift   : "\E[24~"
>-
>-key F1 +Shift    : "\EO2P"
>-key F2 +Shift    : "\EO2Q"
>-key F3 +Shift    : "\EO2R"
>-key F4 +Shift    : "\EO2S"
>-key F5 +Shift    : "\E[15;2~"
>-key F6 +Shift    : "\E[17;2~"
>-key F7 +Shift    : "\E[18;2~"
>-key F8 +Shift    : "\E[19;2~"
>-key F9 +Shift    : "\E[20;2~"
>-key F10+Shift    : "\E[21;2~"
>-key F11+Shift    : "\E[23;2~"
>-key F12+Shift    : "\E[24;2~"
>+key Home        -AnyMod     -AppCuKeys : "\E[H"  
>+key End         -AnyMod     -AppCuKeys : "\E[F"  
>+key Home        -AnyMod     +AppCuKeys : "\EOH"  
>+key End         -AnyMod     +AppCuKeys : "\EOF"  
>+key Home        +AnyMod                : "\E[1;*H"
>+key End         +AnyMod                : "\E[1;*F"
>+
>+key Insert-Shift-AnyMod                : "\E[2~"  
>+key Delete      -AnyMod                : "\E[3~"  
>+key Prior -Shift-AnyMod                : "\E[5~"  
>+key Next  -Shift-AnyMod                : "\E[6~"  
>+
>+key Insert-Shift+AnyMod                : "\E[2;*~"
>+key Delete      +AnyMod                : "\E[3;*~"  
>+key Prior -Shift+AnyMod                : "\E[5;*~"  
>+key Next  -Shift+AnyMod                : "\E[6;*~"  
>+
>+# Function keys
>+key F1          -AnyMod                : "\EOP"
>+key F2          -AnyMod                : "\EOQ"
>+key F3          -AnyMod                : "\EOR"
>+key F4          -AnyMod                : "\EOS"
>+key F5          -AnyMod                : "\E[15~"
>+key F6          -AnyMod                : "\E[17~"
>+key F7          -AnyMod                : "\E[18~"
>+key F8          -AnyMod                : "\E[19~"
>+key F9          -AnyMod                : "\E[20~"
>+key F10         -AnyMod                : "\E[21~"
>+key F11         -AnyMod                : "\E[23~"
>+key F12         -AnyMod                : "\E[24~"
>+
>+key F1          +AnyMod                : "\EO*P"
>+key F2          +AnyMod                : "\EO*Q"
>+key F3          +AnyMod                : "\EO*R"
>+key F4          +AnyMod                : "\EO*S"
>+key F5          +AnyMod                : "\E[15;*~"
>+key F6          +AnyMod                : "\E[17;*~"
>+key F7          +AnyMod                : "\E[18;*~"
>+key F8          +AnyMod                : "\E[19;*~"
>+key F9          +AnyMod                : "\E[20;*~"
>+key F10         +AnyMod                : "\E[21;*~"
>+key F11         +AnyMod                : "\E[23;*~"
>+key F12         +AnyMod                : "\E[24;*~"
> 
> # Work around dead keys
> 
>--- kdebase-3.3.2/konsole/konsole/TEmulation.cpp.konsole-keymap	2005-02-25 11:32:41.473250344 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEmulation.cpp	2005-02-25 11:34:41.034074336 +0100
>@@ -461,6 +461,11 @@
>   }
> }
> 
>+char TEmulation::getErase()
>+{
>+  return '\b';
>+}
>+
> void TEmulation::setListenToKeyPress(bool l)
> {
>   listenToKeyPress=l;
>--- kdebase-3.3.2/konsole/konsole/default.keytab.h.konsole-keymap	2004-06-22 19:32:54.000000000 +0200
>+++ kdebase-3.3.2/konsole/konsole/default.keytab.h	2005-02-25 09:36:13.000000000 +0100
>@@ -8,58 +8,63 @@
>   "key Return-Shift-NewLine : \"\\r\"\n"
>   "key Return-Shift+NewLine : \"\\r\\n\"\n"
>   "key Return+Shift         : \"\\EOM\"\n"
>-  "key Backspace      : \"\\x7f\"\n"
>+  "key Backspace        : \"\\x08\"\n"
>   "key Up   -Shift-Ansi : \"\\EA\"\n"
>   "key Down -Shift-Ansi : \"\\EB\"\n"
>-  "key Right-Shift-Ansi : \"\\EC\"\n"
>-  "key Left -Shift-Ansi : \"\\ED\"\n"
>-  "key Up   -Shift+Ansi+AppCuKeys : \"\\EOA\"\n"
>-  "key Down -Shift+Ansi+AppCuKeys : \"\\EOB\"\n"
>-  "key Right-Shift+Ansi+AppCuKeys : \"\\EOC\"\n"
>-  "key Left -Shift+Ansi+AppCuKeys : \"\\EOD\"\n"
>-  "key Up   -Shift+Ansi-AppCuKeys : \"\\E[A\"\n"
>-  "key Down -Shift+Ansi-AppCuKeys : \"\\E[B\"\n"
>-  "key Right-Shift+Ansi-AppCuKeys : \"\\E[C\"\n"
>-  "key Left -Shift+Ansi-AppCuKeys : \"\\E[D\"\n"
>+  "key Right      -Ansi : \"\\EC\"\n"
>+  "key Left       -Ansi : \"\\ED\"\n"
>+  "key Up    -Shift-AnyMod+Ansi+AppCuKeys : \"\\EOA\"\n"
>+  "key Down  -Shift-AnyMod+Ansi+AppCuKeys : \"\\EOB\"\n"
>+  "key Right       -AnyMod+Ansi+AppCuKeys : \"\\EOC\"\n"
>+  "key Left        -AnyMod+Ansi+AppCuKeys : \"\\EOD\"\n"
>+  "key Up    -Shift-AnyMod+Ansi-AppCuKeys : \"\\E[A\"\n"
>+  "key Down  -Shift-AnyMod+Ansi-AppCuKeys : \"\\E[B\"\n"
>+  "key Right       -AnyMod+Ansi-AppCuKeys : \"\\E[C\"\n"
>+  "key Left        -AnyMod+Ansi-AppCuKeys : \"\\E[D\"\n"
>+  "key Up    -Shift+AnyMod+Ansi           : \"\\E[1;*A\"\n"
>+  "key Down  -Shift+AnyMod+Ansi           : \"\\E[1;*B\"\n"
>+  "key Right       +AnyMod+Ansi           : \"\\E[1;*C\"\n"
>+  "key Left        +AnyMod+Ansi           : \"\\E[1;*D\"\n"
>   "key Enter+NewLine : \"\\r\\n\"\n"
>   "key Enter-NewLine : \"\\r\"\n"
>-  "key Home  -Shift-AppCuKeys : \"\\E[H\"  \n"
>-  "key End   -Shift-AppCuKeys : \"\\E[F\"  \n"
>-  "key Home  +Shift-AppCuKeys : \"\\E[2H\"  \n"
>-  "key End   +Shift-AppCuKeys : \"\\E[2F\"  \n"
>-  "key Home  -Shift+AppCuKeys : \"\\EOH\"  \n"
>-  "key End   -Shift+AppCuKeys : \"\\EOF\"  \n"
>-  "key Home  +Shift+AppCuKeys : \"\\EO2H\"  \n"
>-  "key End   +Shift+AppCuKeys : \"\\EO2F\"  \n"
>-  "key Insert-Shift : \"\\E[2~\"  \n"
>-  "key Delete-Shift : \"\\E[3~\"  \n"
>-  "key Prior -Shift : \"\\E[5~\"  \n"
>-  "key Next  -Shift : \"\\E[6~\"  \n"
>-  "key Delete+Shift : \"\\E[3;2~\"  \n"
>-  "key F1    -Shift   : \"\\EOP\"\n"
>-  "key F2    -Shift   : \"\\EOQ\"\n"
>-  "key F3    -Shift   : \"\\EOR\"\n"
>-  "key F4    -Shift   : \"\\EOS\"\n"
>-  "key F5    -Shift   : \"\\E[15~\"\n"
>-  "key F6    -Shift   : \"\\E[17~\"\n"
>-  "key F7    -Shift   : \"\\E[18~\"\n"
>-  "key F8    -Shift   : \"\\E[19~\"\n"
>-  "key F9    -Shift   : \"\\E[20~\"\n"
>-  "key F10   -Shift   : \"\\E[21~\"\n"
>-  "key F11   -Shift   : \"\\E[23~\"\n"
>-  "key F12   -Shift   : \"\\E[24~\"\n"
>-  "key F1 +Shift    : \"\\EO2P\"\n"
>-  "key F2 +Shift    : \"\\EO2Q\"\n"
>-  "key F3 +Shift    : \"\\EO2R\"\n"
>-  "key F4 +Shift    : \"\\EO2S\"\n"
>-  "key F5 +Shift    : \"\\E[15;2~\"\n"
>-  "key F6 +Shift    : \"\\E[17;2~\"\n"
>-  "key F7 +Shift    : \"\\E[18;2~\"\n"
>-  "key F8 +Shift    : \"\\E[19;2~\"\n"
>-  "key F9 +Shift    : \"\\E[20;2~\"\n"
>-  "key F10+Shift    : \"\\E[21;2~\"\n"
>-  "key F11+Shift    : \"\\E[23;2~\"\n"
>-  "key F12+Shift    : \"\\E[24;2~\"\n"
>+  "key Home        -AnyMod     -AppCuKeys : \"\\E[H\"  \n"
>+  "key End         -AnyMod     -AppCuKeys : \"\\E[F\"  \n"
>+  "key Home        -AnyMod     +AppCuKeys : \"\\EOH\"  \n"
>+  "key End         -AnyMod     +AppCuKeys : \"\\EOF\"  \n"
>+  "key Home        +AnyMod                : \"\\E[1;*H\"\n"
>+  "key End         +AnyMod                : \"\\E[1;*F\"\n"
>+  "key Insert-Shift-AnyMod                : \"\\E[2~\"  \n"
>+  "key Delete      -AnyMod                : \"\\E[3~\"  \n"
>+  "key Prior -Shift-AnyMod                : \"\\E[5~\"  \n"
>+  "key Next  -Shift-AnyMod                : \"\\E[6~\"  \n"
>+  "key Insert-Shift+AnyMod                : \"\\E[2;*~\"\n"
>+  "key Delete      +AnyMod                : \"\\E[3;*~\"  \n"
>+  "key Prior -Shift+AnyMod                : \"\\E[5;*~\"  \n"
>+  "key Next  -Shift+AnyMod                : \"\\E[6;*~\"  \n"
>+  "key F1          -AnyMod                : \"\\EOP\"\n"
>+  "key F2          -AnyMod                : \"\\EOQ\"\n"
>+  "key F3          -AnyMod                : \"\\EOR\"\n"
>+  "key F4          -AnyMod                : \"\\EOS\"\n"
>+  "key F5          -AnyMod                : \"\\E[15~\"\n"
>+  "key F6          -AnyMod                : \"\\E[17~\"\n"
>+  "key F7          -AnyMod                : \"\\E[18~\"\n"
>+  "key F8          -AnyMod                : \"\\E[19~\"\n"
>+  "key F9          -AnyMod                : \"\\E[20~\"\n"
>+  "key F10         -AnyMod                : \"\\E[21~\"\n"
>+  "key F11         -AnyMod                : \"\\E[23~\"\n"
>+  "key F12         -AnyMod                : \"\\E[24~\"\n"
>+  "key F1          +AnyMod                : \"\\EO*P\"\n"
>+  "key F2          +AnyMod                : \"\\EO*Q\"\n"
>+  "key F3          +AnyMod                : \"\\EO*R\"\n"
>+  "key F4          +AnyMod                : \"\\EO*S\"\n"
>+  "key F5          +AnyMod                : \"\\E[15;*~\"\n"
>+  "key F6          +AnyMod                : \"\\E[17;*~\"\n"
>+  "key F7          +AnyMod                : \"\\E[18;*~\"\n"
>+  "key F8          +AnyMod                : \"\\E[19;*~\"\n"
>+  "key F9          +AnyMod                : \"\\E[20;*~\"\n"
>+  "key F10         +AnyMod                : \"\\E[21;*~\"\n"
>+  "key F11         +AnyMod                : \"\\E[23;*~\"\n"
>+  "key F12         +AnyMod                : \"\\E[24;*~\"\n"
>   "key Space +Control : \"\\x00\"\n"
>   "key Up    +Shift   : scrollLineUp\n"
>   "key Prior +Shift   : scrollPageUp\n"
>--- kdebase-3.3.2/konsole/konsole/session.cpp.konsole-keymap	2005-02-25 11:01:13.473269968 +0100
>+++ kdebase-3.3.2/konsole/konsole/session.cpp	2005-02-25 11:43:53.158138720 +0100
>@@ -130,6 +130,7 @@
>   sh->run(QFile::encodeName(pgm), args, term.latin1(), winId, add_to_utmp,
>           ("DCOPRef("+appId+",konsole)").latin1(),
>           ("DCOPRef("+appId+","+sessionId+")").latin1());
>+  sh->setErase(em->getErase());
>   if (!initial_cwd.isEmpty())
>      QDir::setCurrent(cwd_save);
>   else
>--- kdebase-3.3.2/konsole/konsole/keytrans.h.konsole-keymap	2004-10-03 09:11:17.000000000 +0200
>+++ kdebase-3.3.2/konsole/konsole/keytrans.h	2005-02-25 09:36:13.000000000 +0100
>@@ -26,6 +26,7 @@
> #define BITS_Alt        6
> #define BITS_AppScreen  7
> #define BITS_COUNT      8
>+#define BITS_AnyMod	9
> 
> #define CMD_none          -1
> #define CMD_send           0
>@@ -63,6 +64,7 @@
>             ~KeyEntry();
>             bool matches(int key, int bits, int mask);
>             bool metaspecified(void);
>+            bool anymodspecified(void);
>             QString text();
>             int ref;
>          private:
>--- kdebase-3.3.2/konsole/konsole/TEmuVt102.h.konsole-keymap	2005-02-25 11:01:40.853107600 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEmuVt102.h	2005-02-25 11:35:22.676743688 +0100
>@@ -81,6 +81,8 @@
>   void resetModes();
> 
>   void setConnect(bool r);
>+  
>+  char getErase();
> 
> private:
> 
>--- kdebase-3.3.2/konsole/konsole/TEmulation.h.konsole-keymap	2005-02-25 11:29:15.371582560 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEmulation.h	2005-02-25 11:29:24.343218664 +0100
>@@ -80,6 +80,8 @@
>   virtual void setConnect(bool r);
>   bool isConnected() { return connected; }
> 
>+  virtual char getErase();
>+
>   virtual void setListenToKeyPress(bool l);
>   void setColumns(int columns);
> 
>--- kdebase-3.3.2/konsole/konsole/keytrans.cpp.konsole-keymap	2004-10-03 09:11:17.000000000 +0200
>+++ kdebase-3.3.2/konsole/konsole/keytrans.cpp	2005-02-25 11:52:52.721112680 +0100
>@@ -52,7 +52,13 @@
> 
> bool KeyTrans::KeyEntry::metaspecified(void)
> {
>-  return (mask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt));
>+  return ((mask & (1 << BITS_Alt))    && (bits & (1 << BITS_Alt))) ||
>+         ((mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)));
>+}
>+
>+bool KeyTrans::KeyEntry::anymodspecified(void)
>+{
>+  return (mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod));
> }
> 
> QString KeyTrans::KeyEntry::text()
>@@ -117,12 +123,27 @@
>                bool* metaspecified)
> {
>   if (!m_fileRead) readConfig();
>+  
>+  if (bits & ((1<<BITS_Shift)|(1<<BITS_Alt)|(1<<BITS_Control)))
>+    bits |= (1<<BITS_AnyMod);
>+  
>   for (QPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
>     if (it.current()->matches(key,bits,0xffff))
>     {
>       *cmd = it.current()->cmd;
>-      *txt = it.current()->txt.ascii();
>       *len = it.current()->txt.length();
>+      if ((*cmd==CMD_send) && it.current()->anymodspecified() && (*len < 16))
>+      {
>+        static char buf[16];
>+        char *c, mask = '1' + BITS(0, bits&(1<<BITS_Shift)) +
>+          BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control));
>+        strcpy(buf, it.current()->txt.ascii());
>+        c = strchr(buf, '*');
>+        if (c) *c = mask;
>+        *txt = buf;
>+      }
>+      else
>+        *txt = it.current()->txt.ascii();
>       *metaspecified = it.current()->metaspecified();
>       return true;
>     }
>@@ -483,6 +504,8 @@
>   defModSym("NewLine",    BITS_NewLine      );
>   defModSym("AppCuKeys",  BITS_AppCuKeys    );
>   defModSym("AppScreen",  BITS_AppScreen    );
>+  // Special (Any Modifier)
>+  defModSym("AnyMod",     BITS_AnyMod       );
> }
> 
> void KeyTransSymbols::defKeySyms()
>--- kdebase-3.3.2/konsole/konsole/TEmuVt102.cpp.konsole-keymap	2005-02-25 11:01:35.196967464 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEmuVt102.cpp	2005-02-25 11:35:09.187794320 +0100
>@@ -1184,6 +1184,20 @@
>   }
> }
> 
>+char TEmuVt102::getErase()
>+{
>+  int cmd = CMD_none; 
>+  const char* txt; 
>+  int len;
>+  bool metaspecified;
>+  
>+  if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len,
>+      &metaspecified) && (cmd==CMD_send) && (len == 1))
>+    return txt[0];
>+    
>+  return '\b';
>+}
>+
> /* ------------------------------------------------------------------------- */
> /*                                                                           */
> /*                               Diagnostic                                  */
>--- kdebase-3.3.2/konsole/konsole/TEPty.cpp.konsole-keymap	2005-02-25 10:48:34.495652104 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEPty.cpp	2005-02-25 11:23:28.974242960 +0100
>@@ -69,6 +69,7 @@
> #include <sys/stat.h>
> #include <unistd.h>
> #include <errno.h>
>+#include <termios.h>
>                      
> #include <kstandarddirs.h>
> #include <klocale.h>
>@@ -93,6 +94,21 @@
>   pty()->setXonXoff(on);
> }
> 
>+void TEPty::setErase(char erase)
>+{
>+  struct termios tios;
>+  int fd = pty()->slaveFd();
>+  
>+  if(tcgetattr(fd, &tios))
>+  {
>+    qWarning("Uh oh.. can't get terminal attributes..");
>+    return;
>+  }
>+  tios.c_cc[VERASE] = erase;
>+  if(tcsetattr(fd, TCSANOW, &tios))
>+    qWarning("Uh oh.. can't set terminal attributes..");
>+}
>+
> /*!
>     start the client program.
> */
>--- kdebase-3.3.2/konsole/konsole/TEPty.h.konsole-keymap	2005-02-25 10:49:25.213941752 +0100
>+++ kdebase-3.3.2/konsole/konsole/TEPty.h	2005-02-25 10:50:16.681117552 +0100
>@@ -46,6 +46,7 @@
>     QString error() { return m_strError; }
>     void setXonXoff(bool on);
>     void setSize(int lines, int cols);
>+    void setErase(char erase);
> 
>   public slots:
>     void lockPty(bool lock);

Actions: View | Diff

Attachments on bug 138191: 111423 | 111812 | 111862 | 112337 | 113354