Merge branch 'release-1.0'

saitoha · Dec 29, 2014 · 3182434 · 3182434
2 parents 672322e + c58077b
commit 3182434
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,25 @@
+2014-12-29  Hayaki Saito <[email protected]>
+
+  * MTParser.m, README.md: Quick fix for tmux DA1 handling progmem(Thanks to
+  @benoitc).
+
+2014-12-24  Hayaki Saito <[email protected]>
+
+  * README.md: Conflicts: Makefile README.md
+
 2014-12-23  Hayaki Saito <[email protected]>
 
-  * MTShell.m: Add kmous to termcap entries
+  * Info.plist: Update Info.plist
+
+  * Makefile: Makefile tweak
+
+  * ChangeLog: Add ChangeLog
 
   * MTParser.m, MTShell.m, MTView.h, MTView.m, MouseTerm.m: Add extend mode
   8810: treat emoji as double width characters
 
+  * MTShell.m: Add kmous to termcap entries
+
   * MTParser.m, Mouse.h, README.md: Report customized DA1 response
 
   * Makefile: Makefile tweak

diff --git a/Info.plist b/Info.plist
@@ -17,7 +17,7 @@
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
-  <string>plus-1.0a2</string>
+  <string>plus-1.0a3</string>
   <key>NSPrincipalClass</key>
   <string>MouseTerm</string>
   <key>SIMBLTargetApplications</key>

diff --git a/MTParser.m b/MTParser.m
@@ -277,11 +277,13 @@ static void esc_dispatch(struct parse_context *ppc, MTShell *shell)
 static void csi_dispatch(struct parse_context *ppc, MTShell *shell)
 {
     switch (ppc->action) {
+#if 0
     case 'c':
         [(TTShell*) shell writeData: [NSData dataWithBytes: PDA_RESPONSE
                                                     length: PDA_RESPONSE_LEN]];
         *ppc->p = 0x7f;
         break;
+#endif
     case ('>' << 8) | 'c':
         [(TTShell*) shell writeData: [NSData dataWithBytes: SDA_RESPONSE
                                                     length: SDA_RESPONSE_LEN]];

diff --git a/README.md b/README.md
@@ -48,7 +48,6 @@ Additionally, this project does:
 * Handle "multiple-parameterized" control sequences(e.g. "\e[?1000;1006h") correctly.
 * Ignore unhandled DCS/APC/PM/SOS control string.
 * Localization support of menu resource (French/Japanese).
-* Report customized DA1 response ("\033[>1;2;22c").
 * Report original DA2 response ("\033[>19796;10000;2c").
 * Support xterm's "tcap-query" feature.
 * Support xterm's "Title stacking".