From 441b83519238aeac8e8cb1a2fdac3f063600f5a9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 12 Nov 2016 18:02:47 -0300
Subject: [PATCH 01/77] Add shorter invervals for the backup thread

---
 data/pref.xml                     | 2 +-
 data/widgets/options.xml          | 3 +++
 src/app/commands/cmd_options.cpp  | 2 +-
 src/app/crash/backup_observer.cpp | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 50f5f2fa1..2cf5914e9 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -98,7 +98,7 @@
       <option id="rewind_on_stop" type="bool" default="false" />
       <option id="expand_menubar_on_mouseover" type="bool" default="false" migrate="Options.ExpandMenuBarOnMouseover" />
       <option id="data_recovery" type="bool" default="true" />
-      <option id="data_recovery_period" type="int" default="2" />
+      <option id="data_recovery_period" type="double" default="2.0" />
       <option id="show_full_path" type="bool" default="true" />
       <option id="timeline_position" type="TimelinePosition" default="TimelinePosition::BOTTOM" />
     </section>
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 5b566a257..75043bd9e 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -43,6 +43,9 @@
           <hbox>
             <check text="Automatically save recovery data every" id="enable_data_recovery" tooltip="With this option you can recover your documents&#10;if the program finalizes unexpectedly." />
             <combobox id="data_recovery_period">
+              <listitem text="10 seconds" value="0.33" />
+              <listitem text="30 seconds" value="0.5" />
+              <listitem text="1 Minutes" value="1" />
               <listitem text="2 Minutes" value="2" />
               <listitem text="5 Minutes" value="5" />
               <listitem text="10 Minutes" value="10" />
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 977d58eac..3f8accd7d 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -252,7 +252,7 @@ public:
 
     std::string warnings;
 
-    int newPeriod = base::convert_to<int>(dataRecoveryPeriod()->getValue());
+    double newPeriod = base::convert_to<double>(dataRecoveryPeriod()->getValue());
     if (enableDataRecovery()->isSelected() != m_pref.general.dataRecovery() ||
         newPeriod != m_pref.general.dataRecoveryPeriod()) {
       m_pref.general.dataRecovery(enableDataRecovery()->isSelected());
diff --git a/src/app/crash/backup_observer.cpp b/src/app/crash/backup_observer.cpp
index 4334fc2bd..260ae44fa 100644
--- a/src/app/crash/backup_observer.cpp
+++ b/src/app/crash/backup_observer.cpp
@@ -82,8 +82,8 @@ void BackupObserver::onRemoveDocument(doc::Document* document)
 
 void BackupObserver::backgroundThread()
 {
-  int normalPeriod = 60*Preferences::instance().general.dataRecoveryPeriod();
-  int lockedPeriod = 10;
+  int normalPeriod = int(60.0*Preferences::instance().general.dataRecoveryPeriod());
+  int lockedPeriod = 5;
 #if 0                           // Just for testing purposes
   normalPeriod = 5;
   lockedPeriod = 5;

From b524052ecf8e53c3fc6c5a1d1d67e3b01b296343 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 12 Nov 2016 18:19:39 -0300
Subject: [PATCH 02/77] Update licenses in README

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ee2332d1a..b88e58333 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,7 @@ And it uses the following third-party libraries:
 
 * [Allegro 4](http://alleg.sourceforge.net/) - [allegro4 license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/allegro4-LICENSE.txt)
 * [FreeType](http://www.freetype.org/) - [FTL license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/FTL.txt)
-* [Google Test](https://github.com/google/googletest) - [gtest license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/gtest-LICENSE.txt)
-* [XFree86](http://www.x.org/) - [XFree86 license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/XFree86-LICENSE.txt)
+* [Google Test](https://github.com/google/googletest) - [BSD-like license](https://github.com/aseprite/googletest/blob/master/googletest/LICENSE)
 * [curl](http://curl.haxx.se/) - [curl license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/curl-LICENSE.txt)
 * [duktape](http://duktape.org/) - [MIT license](https://github.com/aseprite/aseprite/tree/master/third_party/duktape/LICENSE.txt)
 * [giflib](http://sourceforge.net/projects/giflib/) - [giflib license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/giflib-LICENSE.txt)
@@ -86,9 +85,9 @@ And it uses the following third-party libraries:
 * [libpng](http://www.libpng.org/pub/png/) - [libpng license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/libpng-LICENSE.txt)
 * [libwebp](https://developers.google.com/speed/webp/) - [libwebp license](https://chromium.googlesource.com/webm/libwebp/+/master/COPYING)
 * [loadpng](http://tjaden.strangesoft.net/loadpng/) - [zlib license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/ZLIB.txt)
-* [modp_b64](https://github.com/aseprite/aseprite/tree/master/third_party/modp_b64/modp_b64.h) - [BSD license](https://github.com/aseprite/aseprite/tree/master/third_party/modp_b64/LICENSE)
 * [pixman](http://www.pixman.org/) - [MIT license](http://cgit.freedesktop.org/pixman/plain/COPYING)
 * [simpleini](https://github.com/aseprite/simpleini/) - [MIT license](https://github.com/aseprite/simpleini/blob/aseprite/LICENCE.txt)
+* [stringencoders](https://github.com/client9/stringencoders) - [MIT license](https://github.com/aseprite/stringencoders/blob/master/LICENSE)
 * [tinyxml](http://www.sourceforge.net/projects/tinyxml) - [zlib license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/ZLIB.txt)
 * [zlib](http://www.gzip.org/zlib/) - [ZLIB license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/ZLIB.txt)
 

From 57094faa670da88ecbc02631d9f97c2498e3fb7b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 12:03:35 -0300
Subject: [PATCH 03/77] Update submodules

---
 laf      | 2 +-
 src/clip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/laf b/laf
index 11274341a..381923970 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 11274341a6390f9dda085256f98567156aa21cc9
+Subproject commit 381923970189e1af76f03f03ebf6877d7610451a
diff --git a/src/clip b/src/clip
index 3e9533e33..926e3cf0a 160000
--- a/src/clip
+++ b/src/clip
@@ -1 +1 @@
-Subproject commit 3e9533e332e6b1982476c255eedaae917e63dfec
+Subproject commit 926e3cf0ae484111d89cacd769d29c4d1e073dec

From f4f3dd2c4c5175f09f4bcdad2975de4dc88218d1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 12:03:49 -0300
Subject: [PATCH 04/77] Fix some links in README

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b88e58333..61f441f11 100644
--- a/README.md
+++ b/README.md
@@ -102,8 +102,7 @@ This program is distributed under three different licenses:
    (e.g. [laf](https://github.com/aseprite/laf),
    [clip](https://github.com/aseprite/clip),
    [she](https://github.com/aseprite/aseprite/tree/master/src/she),
-   [gfx](https://github.com/aseprite/gfx),
-   [ui](https://github.com/aseprite/ui), etc.).
+   [gfx](src/gfx), [ui](src/ui), etc.).
 2. You can request a special
    [educational license](http://www.aseprite.org/faq/#is-there-an-educational-license)
    in case you are a teacher in an educational institution and want to

From e345170948a17a4eac5cac5177e028fb6a01d035 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 12:05:16 -0300
Subject: [PATCH 05/77] Fix int/unsigned comparison warning

---
 src/app/ui/palettes_listbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/palettes_listbox.cpp b/src/app/ui/palettes_listbox.cpp
index 2f19fb636..aa21e7126 100644
--- a/src/app/ui/palettes_listbox.cpp
+++ b/src/app/ui/palettes_listbox.cpp
@@ -63,7 +63,7 @@ class PalettesListItem : public ResourceListItem {
 
       int j, i = m_comment.find("http");
       if (i != std::string::npos) {
-        for (j=i+4; j<m_comment.size() && is_url_char(m_comment[j]); ++j)
+        for (j=i+4; j<int(m_comment.size()) && is_url_char(m_comment[j]); ++j)
           ;
         base::launcher::open_url(m_comment.substr(i, j-i));
       }

From 57f51e65e2530a8c63ca92c27f06c0273d3f3200 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 12:05:47 -0300
Subject: [PATCH 06/77] Fix unused variable warning

---
 src/app/ui/editor/standby_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index d5b5f84ab..7ca988399 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -226,7 +226,7 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
           MovingCelState* newState = new MovingCelState(editor, msg);
           editor->setState(EditorStatePtr(newState));
         }
-        catch (const LockedDocumentException& ex) {
+        catch (const LockedDocumentException&) {
           // TODO break the background task that is locking this sprite
           StatusBar::instance()->showTip(1000,
             "Sprite is used by a backup/data recovery task");

From a5e860c556c4aa51b0eae4cfd1812118aa96bc55 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 15:52:51 -0300
Subject: [PATCH 07/77] Add Alt+L and Alt+F shortcuts in palette popup

---
 data/widgets/palette_popup.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/widgets/palette_popup.xml b/data/widgets/palette_popup.xml
index 2c2d2b5f9..93078552f 100644
--- a/data/widgets/palette_popup.xml
+++ b/data/widgets/palette_popup.xml
@@ -1,13 +1,13 @@
 <!-- ASEPRITE -->
-<!-- Copyright (C) 2014 by David Capello -->
+<!-- Copyright (C) 2014-2016 by David Capello -->
 <gui>
   <vbox id="palette_popup">
     <label text="Available Palettes:" />
     <view id="view" expansive="true" />
     <hbox>
-      <button id="load_pal" text="Load" width="80" />
+      <button id="load_pal" text="&amp;Load" width="80" />
       <hbox expansive="true" />
-      <button id="open_folder" text="Open Folder" width="60" />
+      <button id="open_folder" text="Open &amp;Folder" width="60" />
     </hbox>
   </vbox>
 </gui>

From b95326435cf4fdeafc6957816ab52a58016a5e15 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 15:53:36 -0300
Subject: [PATCH 08/77] Remove an always-true if statement

---
 src/ui/widget.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index c88d4567c..311b11cda 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -1320,20 +1320,19 @@ bool Widget::onProcessMessage(Message* msg)
       else
         break;
 
-    case kDoubleClickMessage:
+    case kDoubleClickMessage: {
       // Convert double clicks into mouse down
-      if (kMouseDownMessage) {
-        MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
-        MouseMessage mouseMsg2(kMouseDownMessage,
-                               mouseMsg->pointerType(),
-                               mouseMsg->buttons(),
-                               mouseMsg->modifiers(),
-                               mouseMsg->position(),
-                               mouseMsg->wheelDelta());
+      MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
+      MouseMessage mouseMsg2(kMouseDownMessage,
+                             mouseMsg->pointerType(),
+                             mouseMsg->buttons(),
+                             mouseMsg->modifiers(),
+                             mouseMsg->position(),
+                             mouseMsg->wheelDelta());
 
-        sendMessage(&mouseMsg2);
-      }
+      sendMessage(&mouseMsg2);
       break;
+    }
 
     case kMouseDownMessage:
     case kMouseUpMessage:

From 4c2a283bd775c349eb49938ccf8308929648b4e5 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 15:55:21 -0300
Subject: [PATCH 09/77] Double-click on a preset palette loads it

---
 src/app/ui/palette_popup.cpp |  3 ++-
 src/ui/listitem.cpp          | 16 +++++++++++++++-
 src/ui/listitem.h            |  3 ++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/palette_popup.cpp b/src/app/ui/palette_popup.cpp
index 3dea6456e..af2a1cf8f 100644
--- a/src/app/ui/palette_popup.cpp
+++ b/src/app/ui/palette_popup.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -37,6 +37,7 @@ PalettePopup::PalettePopup()
 
   addChild(m_popup);
 
+  m_paletteListBox.DoubleClickItem.connect(base::Bind<void>(&PalettePopup::onLoadPal, this));
   m_popup->loadPal()->Click.connect(base::Bind<void>(&PalettePopup::onLoadPal, this));
   m_popup->openFolder()->Click.connect(base::Bind<void>(&PalettePopup::onOpenFolder, this));
 
diff --git a/src/ui/listitem.cpp b/src/ui/listitem.cpp
index 94037b18c..2f37f2f6f 100644
--- a/src/ui/listitem.cpp
+++ b/src/ui/listitem.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -29,6 +29,20 @@ ListItem::ListItem(const std::string& text)
   initTheme();
 }
 
+bool ListItem::onProcessMessage(Message* msg)
+{
+  switch (msg->type()) {
+    case kDoubleClickMessage:
+      // Propagate the message to the parent.
+      if (parent())
+        return parent()->sendMessage(msg);
+      else
+        break;
+      break;
+  }
+  return Widget::onProcessMessage(msg);
+}
+
 void ListItem::onPaint(PaintEvent& ev)
 {
   theme()->paintListItem(ev);
diff --git a/src/ui/listitem.h b/src/ui/listitem.h
index deb84a956..ffdf3d968 100644
--- a/src/ui/listitem.h
+++ b/src/ui/listitem.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -23,6 +23,7 @@ namespace ui {
     }
 
   protected:
+    bool onProcessMessage(Message* msg) override;
     void onPaint(PaintEvent& ev) override;
     void onResize(ResizeEvent& ev) override;
     void onSizeHint(SizeHintEvent& ev) override;

From 9b1f0bf33cc394ba1cb0537872ef6f5b97319478 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 15:56:28 -0300
Subject: [PATCH 10/77] Add a checkbox tick to the selected preset palette (fix
 #1327)

---
 src/app/ui/palettes_listbox.cpp  | 20 +++++++++++++++++++-
 src/app/ui/palettes_listbox.h    |  2 +-
 src/app/ui/resources_listbox.cpp |  4 ++--
 src/app/ui/resources_listbox.h   |  4 ++--
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/app/ui/palettes_listbox.cpp b/src/app/ui/palettes_listbox.cpp
index aa21e7126..6189e644e 100644
--- a/src/app/ui/palettes_listbox.cpp
+++ b/src/app/ui/palettes_listbox.cpp
@@ -10,14 +10,19 @@
 
 #include "app/ui/palettes_listbox.h"
 
+#include "app/document.h"
 #include "app/modules/palettes.h"
 #include "app/res/palette_resource.h"
 #include "app/res/palettes_loader_delegate.h"
+#include "app/ui/document_view.h"
+#include "app/ui/editor/editor.h"
 #include "app/ui/icon_button.h"
 #include "app/ui/skin/skin_theme.h"
+#include "app/ui_context.h"
 #include "base/bind.h"
 #include "base/launcher.h"
 #include "doc/palette.h"
+#include "doc/sprite.h"
 #include "she/surface.h"
 #include "ui/graphics.h"
 #include "ui/listitem.h"
@@ -128,9 +133,22 @@ void PalettesListBox::onResourceChange(Resource* resource)
   PalChange(palette);
 }
 
-void PalettesListBox::onPaintResource(Graphics* g, const gfx::Rect& bounds, Resource* resource)
+void PalettesListBox::onPaintResource(Graphics* g, gfx::Rect& bounds, Resource* resource)
 {
   doc::Palette* palette = static_cast<PaletteResource*>(resource)->palette();
+  auto tick = SkinTheme::instance()->parts.checkSelected()->bitmap(0);
+
+  // Draw tick (to say "this palette matches the active sprite
+  // palette").
+  auto view = UIContext::instance()->activeView();
+  if (view && view->document()) {
+    auto docPal = view->document()->sprite()->palette(view->editor()->frame());
+    if (docPal && *docPal == *palette)
+      g->drawRgbaSurface(tick, bounds.x, bounds.y+bounds.h/2-tick->height()/2);
+  }
+
+  bounds.x += tick->width();
+  bounds.w -= tick->width();
 
   gfx::Rect box(
     bounds.x, bounds.y+bounds.h-6*guiscale(),
diff --git a/src/app/ui/palettes_listbox.h b/src/app/ui/palettes_listbox.h
index 5352ee7fb..20b6c2c19 100644
--- a/src/app/ui/palettes_listbox.h
+++ b/src/app/ui/palettes_listbox.h
@@ -28,7 +28,7 @@ namespace app {
   protected:
     virtual ResourceListItem* onCreateResourceItem(Resource* resource) override;
     virtual void onResourceChange(Resource* resource) override;
-    virtual void onPaintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource) override;
+    virtual void onPaintResource(ui::Graphics* g, gfx::Rect& bounds, Resource* resource) override;
     virtual void onResourceSizeHint(Resource* resource, gfx::Size& size) override;
 
     ui::TooltipManager m_tooltips;
diff --git a/src/app/ui/resources_listbox.cpp b/src/app/ui/resources_listbox.cpp
index 0908f52d8..b80105f5c 100644
--- a/src/app/ui/resources_listbox.cpp
+++ b/src/app/ui/resources_listbox.cpp
@@ -67,7 +67,7 @@ void ResourceListItem::onPaint(PaintEvent& ev)
 
   g->drawString(text(), fgcolor, gfx::ColorNone,
                 gfx::Point(
-                  bounds.x + guiscale()*2,
+                  bounds.x + 2*guiscale(),
                   bounds.y + bounds.h/2 - g->measureUIString(text()).h/2));
 }
 
@@ -124,7 +124,7 @@ Resource* ResourcesListBox::selectedResource()
     return NULL;
 }
 
-void ResourcesListBox::paintResource(Graphics* g, const gfx::Rect& bounds, Resource* resource)
+void ResourcesListBox::paintResource(Graphics* g, gfx::Rect& bounds, Resource* resource)
 {
   onPaintResource(g, bounds, resource);
 }
diff --git a/src/app/ui/resources_listbox.h b/src/app/ui/resources_listbox.h
index 1bd932f8d..3dac65a08 100644
--- a/src/app/ui/resources_listbox.h
+++ b/src/app/ui/resources_listbox.h
@@ -47,11 +47,11 @@ class ResourceListItem : public ui::ListItem {
 
     // abstract
     virtual void onResourceChange(Resource* resource) = 0;
-    virtual void onPaintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource) = 0;
+    virtual void onPaintResource(ui::Graphics* g, gfx::Rect& bounds, Resource* resource) = 0;
     virtual void onResourceSizeHint(Resource* resource, gfx::Size& size) = 0;
 
   private:
-    void paintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource);
+    void paintResource(ui::Graphics* g, gfx::Rect& bounds, Resource* resource);
     gfx::Size resourceSizeHint(Resource* resource);
 
     void onTick();

From a19a834c4de6953c1f496aa8cb3780120e0cbb36 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 16:04:29 -0300
Subject: [PATCH 11/77] Enter key selects the preset palette

Also the listbox doesn't lost the focus, so we can continue navigating
preset palettes.
---
 data/widgets/palette_popup.xml | 2 +-
 src/app/ui/palette_popup.cpp   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/widgets/palette_popup.xml b/data/widgets/palette_popup.xml
index 93078552f..362c52e90 100644
--- a/data/widgets/palette_popup.xml
+++ b/data/widgets/palette_popup.xml
@@ -5,7 +5,7 @@
     <label text="Available Palettes:" />
     <view id="view" expansive="true" />
     <hbox>
-      <button id="load_pal" text="&amp;Load" width="80" />
+      <button id="load_pal" text="&amp;Load" width="80" magnet="true" />
       <hbox expansive="true" />
       <button id="open_folder" text="Open &amp;Folder" width="60" />
     </hbox>
diff --git a/src/app/ui/palette_popup.cpp b/src/app/ui/palette_popup.cpp
index af2a1cf8f..50501617f 100644
--- a/src/app/ui/palette_popup.cpp
+++ b/src/app/ui/palette_popup.cpp
@@ -34,6 +34,7 @@ PalettePopup::PalettePopup()
 {
   setAutoRemap(false);
   setBorder(gfx::Border(4*guiscale()));
+  setEnterBehavior(EnterBehavior::DoNothingOnEnter);
 
   addChild(m_popup);
 
@@ -76,6 +77,8 @@ void PalettePopup::onLoadPal()
     CommandsModule::instance()->getCommandByName(CommandId::SetPalette));
   cmd->setPalette(palette);
   UIContext::instance()->executeCommand(cmd);
+
+  m_paletteListBox.requestFocus();
 }
 
 void PalettePopup::onOpenFolder()

From 268cfa3a46ce4ff388056fef5e53e3e6c402600d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 16:12:11 -0300
Subject: [PATCH 12/77] Add support for pinch gesture on palette view

---
 src/app/ui/palette_view.cpp | 47 ++++++++++++++++++++-----------------
 src/app/ui/palette_view.h   |  4 ++--
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp
index 957769e39..5aa37707c 100644
--- a/src/app/ui/palette_view.cpp
+++ b/src/app/ui/palette_view.cpp
@@ -186,15 +186,15 @@ app::Color PaletteView::getColorByPosition(const gfx::Point& pos)
 
 int PaletteView::getBoxSize() const
 {
-  return m_boxsize / guiscale();
+  return int(m_boxsize) / guiscale();
 }
 
-void PaletteView::setBoxSize(int boxsize)
+void PaletteView::setBoxSize(double boxsize)
 {
-  m_boxsize = MID(4, boxsize, 32)*guiscale();
+  m_boxsize = MID(4.0, boxsize, 32.0)*guiscale();
 
   if (m_delegate)
-    m_delegate->onPaletteViewChangeSize(m_boxsize / guiscale());
+    m_delegate->onPaletteViewChangeSize(int(m_boxsize) / guiscale());
 
   View* view = View::getView(this);
   if (view)
@@ -411,6 +411,11 @@ bool PaletteView::onProcessMessage(Message* msg)
       return true;
     }
 
+    case kTouchMagnifyMessage: {
+      setBoxSize(m_boxsize + m_boxsize * static_cast<ui::TouchMessage*>(msg)->magnification());
+      break;
+    }
+
   }
 
   return Widget::onProcessMessage(msg);
@@ -475,14 +480,14 @@ void PaletteView::onPaint(ui::PaintEvent& ev)
       case FgBgColors:
         if (fgIndex == i) {
           gfx::Color neg = color_utils::blackandwhite_neg(gfxColor);
-          for (int i=0; i<m_boxsize/2; ++i)
+          for (int i=0; i<int(m_boxsize/2); ++i)
             g->drawHLine(neg, box.x, box.y+i, m_boxsize/2-i);
         }
 
         if (bgIndex == i) {
           gfx::Color neg = color_utils::blackandwhite_neg(gfxColor);
-          for (int i=0; i<m_boxsize/4; ++i)
-            g->drawHLine(neg, box.x+box.w-(i+1), box.y+box.h-m_boxsize/4+i, i+1);
+          for (int i=0; i<int(m_boxsize/4); ++i)
+            g->drawHLine(neg, box.x+box.w-(i+1), box.y+box.h-int(m_boxsize/4)+i, i+1);
         }
 
         if (transparentIndex == i)
@@ -582,7 +587,7 @@ void PaletteView::onResize(ui::ResizeEvent& ev)
     if (view) {
       int columns =
         (view->viewportBounds().w-this->childSpacing()*2)
-        / (m_boxsize+this->childSpacing());
+        / (int(m_boxsize)+this->childSpacing());
       setColumns(MAX(1, columns));
     }
     m_isUpdatingColumns = false;
@@ -602,8 +607,8 @@ void PaletteView::onSizeHint(ui::SizeHintEvent& ev)
   }
 
   gfx::Size sz;
-  sz.w = border().width() + cols*m_boxsize + (cols-1)*childSpacing();
-  sz.h = border().height() + rows*m_boxsize + (rows-1)*childSpacing();
+  sz.w = border().width() + cols*int(m_boxsize) + (cols-1)*childSpacing();
+  sz.h = border().height() + rows*int(m_boxsize) + (rows-1)*childSpacing();
 
   ev.setSizeHint(sz);
 }
@@ -629,18 +634,18 @@ void PaletteView::update_scroll(int color)
   d = div(currentPalette()->size(), m_columns);
   cols = m_columns;
 
-  y = (m_boxsize+childSpacing()) * (color / cols);
-  x = (m_boxsize+childSpacing()) * (color % cols);
+  y = (int(m_boxsize)+childSpacing()) * (color / cols);
+  x = (int(m_boxsize)+childSpacing()) * (color % cols);
 
   if (scroll.x > x)
     scroll.x = x;
-  else if (scroll.x+vp.w-m_boxsize-2 < x)
-    scroll.x = x-vp.w+m_boxsize+2;
+  else if (scroll.x+vp.w-int(m_boxsize)-2 < x)
+    scroll.x = x-vp.w+int(m_boxsize)+2;
 
   if (scroll.y > y)
     scroll.y = y;
-  else if (scroll.y+vp.h-m_boxsize-2 < y)
-    scroll.y = y-vp.h+m_boxsize+2;
+  else if (scroll.y+vp.h-int(m_boxsize)-2 < y)
+    scroll.y = y-vp.h+int(m_boxsize)+2;
 
   view->setViewScroll(scroll);
 }
@@ -662,9 +667,9 @@ gfx::Rect PaletteView::getPaletteEntryBounds(int index) const
   int row = index / cols;
 
   return gfx::Rect(
-    bounds.x + border().left() + col*(m_boxsize+childSpacing()),
-    bounds.y + border().top() + row*(m_boxsize+childSpacing()),
-    m_boxsize, m_boxsize);
+    bounds.x + border().left() + col*(int(m_boxsize)+childSpacing()),
+    bounds.y + border().top() + row*(int(m_boxsize)+childSpacing()),
+    int(m_boxsize), int(m_boxsize));
 }
 
 PaletteView::Hit PaletteView::hitTest(const gfx::Point& pos)
@@ -716,8 +721,8 @@ PaletteView::Hit PaletteView::hitTest(const gfx::Point& pos)
   }
 
   gfx::Rect box = getPaletteEntryBounds(0);
-  box.w = (m_boxsize+childSpacing());
-  box.h = (m_boxsize+childSpacing());
+  box.w = (int(m_boxsize)+childSpacing());
+  box.h = (int(m_boxsize)+childSpacing());
 
   int colsLimit = m_columns;
   if (m_state == State::DRAGGING_OUTLINE)
diff --git a/src/app/ui/palette_view.h b/src/app/ui/palette_view.h
index 99250a9a6..759f77c14 100644
--- a/src/app/ui/palette_view.h
+++ b/src/app/ui/palette_view.h
@@ -74,7 +74,7 @@ namespace app {
     app::Color getColorByPosition(const gfx::Point& pos) override;
 
     int getBoxSize() const;
-    void setBoxSize(int boxsize);
+    void setBoxSize(double boxsize);
 
     void clearSelection();
     void cutToClipboard();
@@ -147,7 +147,7 @@ namespace app {
     PaletteViewStyle m_style;
     PaletteViewDelegate* m_delegate;
     int m_columns;
-    int m_boxsize;
+    double m_boxsize;
     int m_currentEntry;
     int m_rangeAnchor;
     doc::PalettePicks m_selectedEntries;

From c1e3054e3f8deda4ed695dfd701e9e5839fbacfa Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 16:13:00 -0300
Subject: [PATCH 13/77] Minor changes in preferences dialog labels

---
 src/app/commands/cmd_options.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 3f8accd7d..b8e98dba6 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -158,9 +158,9 @@ public:
       showScrollbars()->setSelected(true);
 
     // Scope
-    gridScope()->addItem("Global");
+    gridScope()->addItem("New Documents");
     if (context->activeDocument()) {
-      gridScope()->addItem("Current Document");
+      gridScope()->addItem("Active Document");
       gridScope()->setSelectedItemIndex(1);
       gridScope()->Change.connect(base::Bind<void>(&OptionsWindow::onChangeGridScope, this));
     }

From 617b909e1e2c1ecd6cc2497f0a7056404eef9a80 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 17:01:41 -0300
Subject: [PATCH 14/77] Fix bug closing the app when it's saving (fix #1326)

---
 src/app/commands/cmd_exit.cpp |  6 ++++++
 src/app/job.cpp               | 14 +++++++++++++-
 src/app/job.h                 |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/app/commands/cmd_exit.cpp b/src/app/commands/cmd_exit.cpp
index b462e231f..27a1913bb 100644
--- a/src/app/commands/cmd_exit.cpp
+++ b/src/app/commands/cmd_exit.cpp
@@ -13,6 +13,7 @@
 #include "app/commands/commands.h"
 #include "app/context.h"
 #include "app/document.h"
+#include "app/job.h"
 #include "app/ui/main_window.h"
 #include "ui/alert.h"
 
@@ -36,6 +37,11 @@ ExitCommand::ExitCommand()
 
 void ExitCommand::onExecute(Context* ctx)
 {
+  // Ignore ExitCommand when we are saving documents or doing a
+  // background task
+  if (Job::runningJobs() > 0)
+    return;
+
   if (ctx->hasModifiedDocuments()) {
     Command* closeAll = CommandsModule::instance()->getCommandByName(CommandId::CloseAllFiles);
     Params params;
diff --git a/src/app/job.cpp b/src/app/job.cpp
index 804b8a5a5..2038ca0f9 100644
--- a/src/app/job.cpp
+++ b/src/app/job.cpp
@@ -19,10 +19,19 @@
 #include "ui/widget.h"
 #include "ui/window.h"
 
+#include <atomic>
+
 static const int kMonitoringPeriod = 100;
+static std::atomic<int> g_runningJobs(0);
 
 namespace app {
 
+// static
+int Job::runningJobs()
+{
+  return g_runningJobs;
+}
+
 Job::Job(const char* jobName)
 {
   m_mutex = NULL;
@@ -60,6 +69,7 @@ Job::~Job()
 void Job::startJob()
 {
   m_thread = new base::thread(&Job::thread_proc, this);
+  ++g_runningJobs;
 
   if (m_alert_window) {
     m_alert_window->openWindowInForeground();
@@ -93,7 +103,9 @@ void Job::waitJob()
   if (m_thread) {
     m_thread->join();
     delete m_thread;
-    m_thread = NULL;
+    m_thread = nullptr;
+
+    --g_runningJobs;
   }
 }
 
diff --git a/src/app/job.h b/src/app/job.h
index d75b88cc2..e639249c2 100644
--- a/src/app/job.h
+++ b/src/app/job.h
@@ -24,6 +24,8 @@ namespace app {
 
   class Job {
   public:
+    static int runningJobs();
+
     Job(const char* jobName);
     virtual ~Job();
 

From 88455ebc4be95b2b48c0c3e257559e0eee675521 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 17:21:37 -0300
Subject: [PATCH 15/77] Fix compilation warnings when REPORT_EVENTS is defined

---
 src/ui/manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 697eed78b..1ad7d1ce5 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1256,7 +1256,7 @@ void Manager::pumpQueue()
 
 #ifdef REPORT_EVENTS
       {
-        static char *msg_name[] = {
+        static const char* msg_name[] = {
           "kOpenMessage",
           "kCloseMessage",
           "kCloseDisplayMessage",

From 2216db2d2c469fcee9cbf642262b2c957a3b65c4 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 17:21:51 -0300
Subject: [PATCH 16/77] Send mouse events when a new window is displayed (fix
 #1221)

In this way if a new widget is displayed it will get the mouse-enter and
set-cursor messages correctly.
---
 src/ui/manager.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 1ad7d1ce5..f087ccf59 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -986,7 +986,7 @@ void Manager::dirtyRect(const gfx::Rect& bounds)
   m_dirtyRegion.createUnion(m_dirtyRegion, gfx::Region(bounds));
 }
 
-/* configures the window for begin the loop */
+// Configures the window for begin the loop
 void Manager::_openWindow(Window* window)
 {
   // Free all widgets of special states.
@@ -1006,6 +1006,12 @@ void Manager::_openWindow(Window* window)
 
   // Update the new windows list to show.
   new_windows.push_back(window);
+
+  // Update mouse widget (as it can be a widget below the
+  // recently opened window).
+  Widget* widget = pick(ui::get_mouse_position());
+  if (widget)
+    setMouse(widget);
 }
 
 void Manager::_closeWindow(Window* window, bool redraw_background)

From 22407428168216eabd944a2a30b9d68a7bed6614 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 19:44:29 -0300
Subject: [PATCH 17/77] Avoid processing the same file two times when it's used
 to load a sequence

E.g. If we drop three files (1.png, 2.png, and 3.png), and we load 1.png
as a sequence, we don't want to ask for the third file.
---
 src/app/commands/cmd_open_file.cpp | 23 +++++++++--------------
 src/app/file/file.h                |  3 ++-
 src/app/modules/gui.cpp            | 25 ++++++++++++++++---------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp
index 9a50e1fb0..13bb78b09 100644
--- a/src/app/commands/cmd_open_file.cpp
+++ b/src/app/commands/cmd_open_file.cpp
@@ -8,6 +8,8 @@
 #include "config.h"
 #endif
 
+#include "app/commands/cmd_open_file.h"
+
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
@@ -32,20 +34,6 @@
 
 namespace app {
 
-class OpenFileCommand : public Command {
-public:
-  OpenFileCommand();
-  Command* clone() const override { return new OpenFileCommand(*this); }
-
-protected:
-  void onLoadParams(const Params& params) override;
-  void onExecute(Context* context) override;
-
-private:
-  std::string m_filename;
-  std::string m_folder;
-};
-
 class OpenFileJob : public Job, public IFileOpProgress
 {
 public:
@@ -104,6 +92,8 @@ void OpenFileCommand::onExecute(Context* context)
 {
   Console console;
 
+  m_usedFiles.clear();
+
   // interactive
   if (context->isUIAvailable() && m_filename.empty()) {
     std::string exts = get_readable_extensions();
@@ -129,6 +119,11 @@ void OpenFileCommand::onExecute(Context* context)
         unrecent = true;
       }
       else {
+        if (fop->isSequence())
+          m_usedFiles = fop->filenames();
+        else
+          m_usedFiles.push_back(fop->filename());
+
         OpenFileJob task(fop);
         task.showProgressWindow();
 
diff --git a/src/app/file/file.h b/src/app/file/file.h
index c33612eae..d7c8afaa1 100644
--- a/src/app/file/file.h
+++ b/src/app/file/file.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -69,6 +69,7 @@ namespace app {
     bool isOneFrame() const { return m_oneframe; }
 
     const std::string& filename() const { return m_filename; }
+    const std::vector<std::string>& filenames() const { return m_seq.filename_list; }
     Context* context() const { return m_context; }
     Document* document() const { return m_document; }
     Document* releaseDocument() {
diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index 615856a27..fd41e7b52 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -9,6 +9,7 @@
 #endif
 
 #include "app/app.h"
+#include "app/commands/cmd_open_file.h"
 #include "app/commands/command.h"
 #include "app/commands/commands.h"
 #include "app/commands/params.h"
@@ -345,16 +346,13 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
 
     case kDropFilesMessage:
       {
-        const DropFilesMessage::Files& files = static_cast<DropFilesMessage*>(msg)->files();
-
-        // Open all files
-        Command* cmd_open_file =
-          CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
-        Params params;
-
+        DropFilesMessage::Files files = static_cast<DropFilesMessage*>(msg)->files();
         UIContext* ctx = UIContext::instance();
 
-        for (const auto& fn : files) {
+        while (!files.empty()) {
+          auto fn = files.front();
+          files.erase(files.begin());
+
           // If the document is already open, select it.
           Document* doc = static_cast<Document*>(ctx->documents().getByFileName(fn));
           if (doc) {
@@ -367,8 +365,17 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
           }
           // Load the file
           else {
+            OpenFileCommand cmd;
+            Params params;
             params.set("filename", fn.c_str());
-            ctx->executeCommand(cmd_open_file, params);
+            ctx->executeCommand(&cmd, params);
+
+            // Remove all used file names from the "dropped files"
+            for (const auto& usedFn : cmd.usedFiles()) {
+              auto it = std::find(files.begin(), files.end(), usedFn);
+              if (it != files.end())
+                files.erase(it);
+            }
           }
         }
       }

From 1e5ae5e9cbe4b510ff402800835d87375d271f29 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 14 Nov 2016 20:00:44 -0300
Subject: [PATCH 18/77] Add missing cmd_open_file.h file in last commit

---
 src/app/commands/cmd_open_file.h | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 src/app/commands/cmd_open_file.h

diff --git a/src/app/commands/cmd_open_file.h b/src/app/commands/cmd_open_file.h
new file mode 100644
index 000000000..d5a0db6ee
--- /dev/null
+++ b/src/app/commands/cmd_open_file.h
@@ -0,0 +1,37 @@
+// Aseprite
+// Copyright (C) 2016  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_COMMANDS_CMD_OPEN_FILE_H_INCLUDED
+#define APP_COMMANDS_CMD_OPEN_FILE_H_INCLUDED
+#pragma once
+
+#include "app/commands/command.h"
+
+#include <string>
+#include <vector>
+
+namespace app {
+
+  class OpenFileCommand : public Command {
+  public:
+    OpenFileCommand();
+    Command* clone() const override { return new OpenFileCommand(*this); }
+
+    const std::vector<std::string>& usedFiles() const { return m_usedFiles; }
+
+  protected:
+    void onLoadParams(const Params& params) override;
+    void onExecute(Context* context) override;
+
+  private:
+    std::string m_filename;
+    std::string m_folder;
+    std::vector<std::string> m_usedFiles;
+  };
+
+} // namespace app
+
+#endif

From 64af97131d2584fcbad0c93e6a34a7df1f4c5f8d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 15 Nov 2016 17:31:56 -0300
Subject: [PATCH 19/77] Support smooth scroll in ListBox

---
 src/ui/listbox.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ui/listbox.cpp b/src/ui/listbox.cpp
index 91a01a044..0ed6b229e 100644
--- a/src/ui/listbox.cpp
+++ b/src/ui/listbox.cpp
@@ -199,8 +199,14 @@ bool ListBox::onProcessMessage(Message* msg)
     case kMouseWheelMessage: {
       View* view = View::getView(this);
       if (view) {
+        auto mouseMsg = static_cast<MouseMessage*>(msg);
         gfx::Point scroll = view->viewScroll();
-        scroll += static_cast<MouseMessage*>(msg)->wheelDelta() * textHeight()*3;
+
+        if (mouseMsg->preciseWheel())
+          scroll += mouseMsg->wheelDelta();
+        else
+          scroll += mouseMsg->wheelDelta() * textHeight()*3;
+
         view->setViewScroll(scroll);
       }
       break;

From 7f174001787a6aff3f3fe93022d091bcb87876b7 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 15 Nov 2016 18:06:27 -0300
Subject: [PATCH 20/77] Minor changes in ui::Alert to simplify its code

---
 src/ui/alert.cpp | 45 +++++++++++++++++++++------------------------
 src/ui/alert.h   | 10 ++++++++--
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/ui/alert.cpp b/src/ui/alert.cpp
index c6ed1c847..aaf99f47b 100644
--- a/src/ui/alert.cpp
+++ b/src/ui/alert.cpp
@@ -82,12 +82,8 @@ AlertPtr Alert::create(const char* format, ...)
   va_end(ap);
 
   // Create the alert window
-  std::vector<Widget*> labels;
-  std::vector<Widget*> buttons;
-
   AlertPtr window(new Alert());
-  window->processString(buf, labels, buttons);
-
+  window->processString(buf);
   return window;
 }
 
@@ -103,20 +99,21 @@ int Alert::show(const char* format, ...)
   va_end(ap);
 
   // Create the alert window
-  std::vector<Widget*> labels;
-  std::vector<Widget*> buttons;
-
   AlertPtr window(new Alert());
-  window->processString(buf, labels, buttons);
+  window->processString(buf);
+  return window->show();
+}
 
+int Alert::show()
+{
   // Open it
-  window->openWindowInForeground();
+  openWindowInForeground();
 
   // Check the closer
   int ret = 0;
-  if (Widget* closer = window->closer()) {
-    for (int i=0; i<(int)buttons.size(); ++i) {
-      if (closer == buttons[i]) {
+  if (Widget* closer = this->closer()) {
+    for (int i=0; i<(int)m_buttons.size(); ++i) {
+      if (closer == m_buttons[i]) {
         ret = i+1;
         break;
       }
@@ -127,7 +124,7 @@ int Alert::show(const char* format, ...)
   return ret;
 }
 
-void Alert::processString(char* buf, std::vector<Widget*>& labels, std::vector<Widget*>& buttons)
+void Alert::processString(char* buf)
 {
   bool title = true;
   bool label = false;
@@ -158,18 +155,18 @@ void Alert::processString(char* buf, std::vector<Widget*>& labels, std::vector<W
         else if (label) {
           Label* label = new Label(beg);
           label->setAlign(align);
-          labels.push_back(label);
+          m_labels.push_back(label);
         }
         else if (separator) {
-          labels.push_back(new Separator("", HORIZONTAL));
+          m_labels.push_back(new Separator("", HORIZONTAL));
         }
         else if (button) {
           char buttonId[256];
           Button* button_widget = new Button(beg);
           button_widget->setMinSize(gfx::Size(60*guiscale(), 0));
-          buttons.push_back(button_widget);
+          m_buttons.push_back(button_widget);
 
-          sprintf(buttonId, "button-%lu", buttons.size());
+          sprintf(buttonId, "button-%lu", m_buttons.size());
           button_widget->setId(buttonId);
           button_widget->Click.connect(base::Bind<void>(&Window::closeWindow, this, button_widget));
         }
@@ -177,10 +174,10 @@ void Alert::processString(char* buf, std::vector<Widget*>& labels, std::vector<W
         buf[c] = chr;
       }
 
-      /* done */
+      // Done
       if (!buf[c])
         break;
-      /* next widget */
+      // Next widget
       else {
         title = label = separator = button = false;
         beg = buf+c+2;
@@ -230,15 +227,15 @@ void Alert::processString(char* buf, std::vector<Widget*>& labels, std::vector<W
 
   grid->addChildInCell(box3, 1, 1, CENTER | BOTTOM | HORIZONTAL);
 
-  for (std::vector<Widget*>::iterator it = labels.begin(); it != labels.end(); ++it)
+  for (auto it=m_labels.begin(); it!=m_labels.end(); ++it)
     box2->addChild(*it);
 
-  for (std::vector<Widget*>::iterator it = buttons.begin(); it != buttons.end(); ++it)
+  for (auto it=m_buttons.begin(); it!=m_buttons.end(); ++it)
     box3->addChild(*it);
 
   // Default button is the last one
-  if (!buttons.empty())
-    buttons[buttons.size()-1]->setFocusMagnet(true);
+  if (!m_buttons.empty())
+    m_buttons[m_buttons.size()-1]->setFocusMagnet(true);
 }
 
 } // namespace ui
diff --git a/src/ui/alert.h b/src/ui/alert.h
index c157aedac..2b8731751 100644
--- a/src/ui/alert.h
+++ b/src/ui/alert.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -11,6 +11,8 @@
 #include "base/shared_ptr.h"
 #include "ui/window.h"
 
+#include <vector>
+
 namespace ui {
 
   class Box;
@@ -26,14 +28,18 @@ namespace ui {
     void addProgress();
     void setProgress(double progress);
 
+    int show();
+
     static AlertPtr create(const char* format, ...);
     static int show(const char* format, ...);
 
   private:
-    void processString(char* buf, std::vector<Widget*>& labels, std::vector<Widget*>& buttons);
+    void processString(char* buf);
 
     Slider* m_progress;
     Box* m_progressPlaceholder;
+    std::vector<Widget*> m_labels;
+    std::vector<Widget*> m_buttons;
   };
 
 } // namespace ui

From 1b736aef8515af5968b492f5e39eb72c09fd3550 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 15 Nov 2016 18:11:47 -0300
Subject: [PATCH 21/77] Improve UX when opening file sequences

* Now we can select the specific files that are part of the sequence
* New checkbox do the same for all dropped files (fix #1284)
---
 data/widgets/open_sequence.xml     |  22 ++++++
 src/app/commands/cmd_open_file.cpp |  36 ++++++++--
 src/app/commands/cmd_open_file.h   |  18 ++++-
 src/app/file/file.cpp              |  65 ++++++++++++++---
 src/app/file/file.h                |  18 +++--
 src/app/modules/gui.cpp            |   3 +-
 src/app/widget_loader.cpp          |   4 ++
 src/ui/listbox.cpp                 | 112 ++++++++++++++++++++++-------
 src/ui/listbox.h                   |  29 +++++++-
 9 files changed, 255 insertions(+), 52 deletions(-)
 create mode 100644 data/widgets/open_sequence.xml

diff --git a/data/widgets/open_sequence.xml b/data/widgets/open_sequence.xml
new file mode 100644
index 000000000..0fcae0707
--- /dev/null
+++ b/data/widgets/open_sequence.xml
@@ -0,0 +1,22 @@
+<!-- ASEPRITE -->
+<!-- Copyright (C) 2016 by David Capello -->
+<gui>
+<window text="Notice" id="open_sequence">
+  <vbox>
+    <label text="Do you want to load the following files as an animation?" />
+    <view expansive="true" id="view" minwidth="128" minheight="64">
+      <listbox id="files" multiselect="true" />
+    </view>
+    <separator horizontal="true" />
+    <check id="repeat" text="Do the same for other files" />
+    <hbox>
+      <boxfiller />
+      <hbox homogeneous="true">
+	<button id="agree" text="&amp;Agree" closewindow="true" minwidth="60" />
+	<button id="skip" text="&amp;Skip" closewindow="true" minwidth="60" magnet="true" />
+      </hbox>
+      <boxfiller />
+    </hbox>
+  </vbox>
+</window>
+</gui>
diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp
index 13bb78b09..26776e8a6 100644
--- a/src/app/commands/cmd_open_file.cpp
+++ b/src/app/commands/cmd_open_file.cpp
@@ -34,8 +34,7 @@
 
 namespace app {
 
-class OpenFileJob : public Job, public IFileOpProgress
-{
+class OpenFileJob : public Job, public IFileOpProgress {
 public:
   OpenFileJob(FileOp* fop)
     : Job("Loading file")
@@ -79,6 +78,8 @@ OpenFileCommand::OpenFileCommand()
   : Command("OpenFile",
             "Open Sprite",
             CmdRecordableFlag)
+  , m_repeatCheckbox(false)
+  , m_seqDecision(SequenceDecision::Ask)
 {
 }
 
@@ -86,6 +87,7 @@ void OpenFileCommand::onLoadParams(const Params& params)
 {
   m_filename = params.get("filename");
   m_folder = params.get("folder"); // Initial folder
+  m_repeatCheckbox = (params.get("repeat_checkbox") == "true");
 }
 
 void OpenFileCommand::onExecute(Context* context)
@@ -108,9 +110,23 @@ void OpenFileCommand::onExecute(Context* context)
   }
 
   if (!m_filename.empty()) {
+    int flags = (m_repeatCheckbox ? FILE_LOAD_SEQUENCE_ASK_CHECKBOX: 0);
+
+    switch (m_seqDecision) {
+      case SequenceDecision::Ask:
+        flags |= FILE_LOAD_SEQUENCE_ASK;
+        break;
+      case SequenceDecision::Agree:
+        flags |= FILE_LOAD_SEQUENCE_YES;
+        break;
+      case SequenceDecision::Skip:
+        flags |= FILE_LOAD_SEQUENCE_NONE;
+        break;
+    }
+
     base::UniquePtr<FileOp> fop(
       FileOp::createLoadDocumentOperation(
-        context, m_filename.c_str(), FILE_LOAD_SEQUENCE_ASK));
+        context, m_filename.c_str(), flags));
     bool unrecent = false;
 
     if (fop) {
@@ -119,10 +135,20 @@ void OpenFileCommand::onExecute(Context* context)
         unrecent = true;
       }
       else {
-        if (fop->isSequence())
+        if (fop->isSequence()) {
+
+          if (fop->sequenceFlags() & FILE_LOAD_SEQUENCE_YES) {
+            m_seqDecision = SequenceDecision::Agree;
+          }
+          else if (fop->sequenceFlags() & FILE_LOAD_SEQUENCE_NONE) {
+            m_seqDecision = SequenceDecision::Skip;
+          }
+
           m_usedFiles = fop->filenames();
-        else
+        }
+        else {
           m_usedFiles.push_back(fop->filename());
+        }
 
         OpenFileJob task(fop);
         task.showProgressWindow();
diff --git a/src/app/commands/cmd_open_file.h b/src/app/commands/cmd_open_file.h
index d5a0db6ee..62742fdd8 100644
--- a/src/app/commands/cmd_open_file.h
+++ b/src/app/commands/cmd_open_file.h
@@ -17,10 +17,24 @@ namespace app {
 
   class OpenFileCommand : public Command {
   public:
+    enum class SequenceDecision {
+      Ask, Agree, Skip,
+    };
+
     OpenFileCommand();
     Command* clone() const override { return new OpenFileCommand(*this); }
 
-    const std::vector<std::string>& usedFiles() const { return m_usedFiles; }
+    SequenceDecision sequenceDecision() const {
+      return m_seqDecision;
+    }
+
+    void setSequenceDecision(SequenceDecision seqDecision) {
+      m_seqDecision = seqDecision;
+    }
+
+    const std::vector<std::string>& usedFiles() const {
+      return m_usedFiles;
+    }
 
   protected:
     void onLoadParams(const Params& params) override;
@@ -29,7 +43,9 @@ namespace app {
   private:
     std::string m_filename;
     std::string m_folder;
+    bool m_repeatCheckbox;
     std::vector<std::string> m_usedFiles;
+    SequenceDecision m_seqDecision;
   };
 
 } // namespace app
diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp
index f6519473d..97d92c092 100644
--- a/src/app/file/file.cpp
+++ b/src/app/file/file.cpp
@@ -32,6 +32,8 @@
 #include "render/render.h"
 #include "ui/alert.h"
 
+#include "open_sequence.xml.h"
+
 #include <cstring>
 #include <cstdarg>
 
@@ -149,6 +151,7 @@ FileOp* FileOp::createLoadDocumentOperation(Context* context, const char* filena
   if (fop->m_format->support(FILE_SUPPORT_SEQUENCES)) {
     /* prepare to load a sequence */
     fop->prepareForSequence();
+    fop->m_seq.flags = flags;
 
     /* per now, we want load just one file */
     fop->m_seq.filename_list.push_back(filename);
@@ -179,18 +182,57 @@ FileOp* FileOp::createLoadDocumentOperation(Context* context, const char* filena
         }
       }
 
-      /* TODO add a better dialog to edit file-names */
-      if ((flags & FILE_LOAD_SEQUENCE_ASK) && context && context->isUIAvailable()) {
-        /* really want load all files? */
-        if ((fop->m_seq.filename_list.size() > 1) &&
-            (ui::Alert::show("Notice"
-              "<<Possible animation with:"
-              "<<%s, %s..."
-              "<<Do you want to load the sequence of bitmaps?"
-              "||&Agree||&Skip",
-              base::get_file_name(fop->m_seq.filename_list[0]).c_str(),
-              base::get_file_name(fop->m_seq.filename_list[1]).c_str()) != 1)) {
+      // TODO add a better dialog to edit file-names
+      if ((flags & FILE_LOAD_SEQUENCE_ASK) &&
+          context &&
+          context->isUIAvailable() &&
+          fop->m_seq.filename_list.size() > 1) {
+        app::gen::OpenSequence window;
+        window.repeat()->setVisible(flags & FILE_LOAD_SEQUENCE_ASK_CHECKBOX ? true: false);
 
+        for (const auto& fn : fop->m_seq.filename_list) {
+          auto item = new ui::ListItem(base::get_file_name(fn));
+          item->setSelected(true);
+          window.files()->addChild(item);
+        }
+
+        window.files()->Change.connect(
+          [&window]{
+            window.agree()->setEnabled(
+              window.files()->getSelectedChild() != nullptr);
+          });
+
+        window.openWindowInForeground();
+
+        // If the user selected the "do the same for other files"
+        // checkbox, we've to save what the user want to do for the
+        // following files.
+        if (window.repeat()->isSelected()) {
+          if (window.closer() == window.agree())
+            fop->m_seq.flags = FILE_LOAD_SEQUENCE_YES;
+          else
+            fop->m_seq.flags = FILE_LOAD_SEQUENCE_NONE;
+        }
+
+        if (window.closer() == window.agree()) {
+          // If the user replies "Agree", we load the selected files.
+          std::vector<std::string> list;
+
+          auto it = window.files()->children().begin();
+          auto end = window.files()->children().end();
+          for (const auto& fn : fop->m_seq.filename_list) {
+            ASSERT(it != end);
+            if (it == end)
+              break;
+            if ((*it)->isSelected())
+              list.push_back(fn);
+            ++it;
+          }
+
+          ASSERT(!list.empty());
+          fop->m_seq.filename_list = list;
+        }
+        else {
           // If the user replies "Skip", we need just one file name
           // (the first one).
           if (fop->m_seq.filename_list.size() > 1) {
@@ -923,6 +965,7 @@ FileOp::FileOp(FileOpType type, Context* context)
   m_seq.frame = frame_t(0);
   m_seq.layer = nullptr;
   m_seq.last_cel = nullptr;
+  m_seq.flags = 0;
 }
 
 void FileOp::prepareForSequence()
diff --git a/src/app/file/file.h b/src/app/file/file.h
index d7c8afaa1..2eaddc5e7 100644
--- a/src/app/file/file.h
+++ b/src/app/file/file.h
@@ -20,8 +20,9 @@
 
 #define FILE_LOAD_SEQUENCE_NONE         0x00000001
 #define FILE_LOAD_SEQUENCE_ASK          0x00000002
-#define FILE_LOAD_SEQUENCE_YES          0x00000004
-#define FILE_LOAD_ONE_FRAME             0x00000008
+#define FILE_LOAD_SEQUENCE_ASK_CHECKBOX 0x00000004
+#define FILE_LOAD_SEQUENCE_YES          0x00000008
+#define FILE_LOAD_ONE_FRAME             0x00000010
 
 namespace doc {
   class Document;
@@ -50,14 +51,18 @@ namespace app {
     FileOpSave
   } FileOpType;
 
-  class IFileOpProgress
-  {
+  class IFileOpProgress {
   public:
     virtual ~IFileOpProgress() { }
     virtual void ackFileOpProgress(double progress) = 0;
   };
 
   // Structure to load & save files.
+  //
+  // TODO This class do to many things. There should be a previous
+  // instance (class) to verify what the user want to do with the
+  // sequence of files, and the result of that operation should be the
+  // input of this one.
   class FileOp {
   public:
     static FileOp* createLoadDocumentOperation(Context* context, const char* filename, int flags);
@@ -107,6 +112,9 @@ namespace app {
     void sequenceSetHasAlpha(bool hasAlpha) {
       m_seq.has_alpha = hasAlpha;
     }
+    int sequenceFlags() const {
+      return m_seq.flags;
+    }
 
     const std::string& error() const { return m_error; }
     void setError(const char *error, ...);
@@ -152,6 +160,8 @@ namespace app {
       LayerImage* layer;
       Cel* last_cel;
       base::SharedPtr<FormatOptions> format_options;
+      // Flags after the user choose what to do with the sequence.
+      int flags;
     } m_seq;
 
     void prepareForSequence();
diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index fd41e7b52..173124f6b 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -348,6 +348,7 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
       {
         DropFilesMessage::Files files = static_cast<DropFilesMessage*>(msg)->files();
         UIContext* ctx = UIContext::instance();
+        OpenFileCommand cmd;
 
         while (!files.empty()) {
           auto fn = files.front();
@@ -365,9 +366,9 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
           }
           // Load the file
           else {
-            OpenFileCommand cmd;
             Params params;
             params.set("filename", fn.c_str());
+            params.set("repeat_checkbox", "true");
             ctx->executeCommand(&cmd, params);
 
             // Remove all used file names from the "dropped files"
diff --git a/src/app/widget_loader.cpp b/src/app/widget_loader.cpp
index 00ef4e1b3..0bc532b17 100644
--- a/src/app/widget_loader.cpp
+++ b/src/app/widget_loader.cpp
@@ -296,6 +296,10 @@ Widget* WidgetLoader::convertXmlElementToWidget(const TiXmlElement* elem, Widget
   else if (elem_name == "listbox") {
     if (!widget)
       widget = new ListBox();
+
+    bool multiselect = bool_attr_is_true(elem, "multiselect");
+    if (multiselect)
+      static_cast<ListBox*>(widget)->setMultiselect(multiselect);
   }
   else if (elem_name == "listitem") {
     ListItem* listitem;
diff --git a/src/ui/listbox.cpp b/src/ui/listbox.cpp
index 0ed6b229e..97a3c6a33 100644
--- a/src/ui/listbox.cpp
+++ b/src/ui/listbox.cpp
@@ -19,17 +19,27 @@
 #include "ui/theme.h"
 #include "ui/view.h"
 
+#include <algorithm>
+
 namespace ui {
 
 using namespace gfx;
 
 ListBox::ListBox()
   : Widget(kListBoxWidget)
+  , m_multiselect(false)
+  , m_firstSelectedIndex(-1)
+  , m_lastSelectedIndex(-1)
 {
   setFocusStop(true);
   initTheme();
 }
 
+void ListBox::setMultiselect(const bool multiselect)
+{
+  m_multiselect = multiselect;
+}
+
 Widget* ListBox::getSelectedChild()
 {
   for (auto child : children())
@@ -53,39 +63,87 @@ int ListBox::getSelectedIndex()
   return -1;
 }
 
-void ListBox::selectChild(Widget* item)
+int ListBox::getChildIndex(Widget* item)
 {
-  for (auto child : children()) {
-    if (child->isSelected()) {
-      if (item && child == item)
-        return;
+  const WidgetsList& children = this->children();
+  auto it = std::find(children.begin(), children.end(), item);
+  if (it != children.end())
+    return it - children.begin();
+  else
+    return -1;
+}
 
-      child->setSelected(false);
+Widget* ListBox::getChildByIndex(int index)
+{
+  const WidgetsList& children = this->children();
+  if (index >= 0 && index < int(children.size()))
+    return children[index];
+  else
+    return nullptr;
+}
+
+void ListBox::selectChild(Widget* item, Message* msg)
+{
+  int itemIndex = getChildIndex(item);
+  m_lastSelectedIndex = itemIndex;
+
+  if (m_multiselect) {
+    // Save current state of all children when we start selecting
+    if (msg == nullptr ||
+        msg->type() == kMouseDownMessage ||
+        msg->type() == kKeyDownMessage) {
+      m_firstSelectedIndex = itemIndex;
+      m_states.resize(children().size());
+
+      int i = 0;
+      for (auto child : children()) {
+        bool state = child->isSelected();
+        if (msg && !msg->ctrlPressed() && !msg->cmdPressed())
+          state = false;
+        m_states[i] = state;
+        ++i;
+      }
     }
   }
 
-  if (item) {
-    item->setSelected(true);
-    makeChildVisible(item);
+  int i = 0;
+  for (auto child : children()) {
+    bool newState;
+
+    if (m_multiselect) {
+      newState = m_states[i];
+
+      if (i >= MIN(itemIndex, m_firstSelectedIndex) &&
+          i <= MAX(itemIndex, m_firstSelectedIndex)) {
+        newState = !newState;
+      }
+    }
+    else {
+      newState = (child == item);
+    }
+
+    if (child->isSelected() != newState)
+      child->setSelected(newState);
+
+    ++i;
   }
 
+  if (item)
+    makeChildVisible(item);
+
   onChange();
 }
 
-void ListBox::selectIndex(int index)
+void ListBox::selectIndex(int index, Message* msg)
 {
-  const WidgetsList& children = this->children();
-  if (index < 0 || index >= (int)children.size())
-    return;
-
-  ListItem* child = static_cast<ListItem*>(children[index]);
-  ASSERT(child);
-  selectChild(child);
+  Widget* child = getChildByIndex(index);
+  if (child)
+    selectChild(child, msg);
 }
 
-std::size_t ListBox::getItemsCount() const
+int ListBox::getItemsCount() const
 {
-  return children().size();
+  return int(children().size());
 }
 
 void ListBox::makeChildVisible(Widget* child)
@@ -152,21 +210,20 @@ bool ListBox::onProcessMessage(Message* msg)
     case kMouseMoveMessage:
       if (hasCapture()) {
         gfx::Point mousePos = static_cast<MouseMessage*>(msg)->position();
-        int select = getSelectedIndex();
         View* view = View::getView(this);
         bool pick_item = true;
 
-        if (view) {
+        if (view && m_lastSelectedIndex >= 0) {
           gfx::Rect vp = view->viewportBounds();
 
           if (mousePos.y < vp.y) {
             int num = MAX(1, (vp.y - mousePos.y) / 8);
-            selectIndex(select-num);
+            selectIndex(MID(0, m_lastSelectedIndex-num, getItemsCount()-1), msg);
             pick_item = false;
           }
           else if (mousePos.y >= vp.y + vp.h) {
             int num = MAX(1, (mousePos.y - (vp.y+vp.h-1)) / 8);
-            selectIndex(select+num);
+            selectIndex(MID(0, m_lastSelectedIndex+num, getItemsCount()-1), msg);
             pick_item = false;
           }
         }
@@ -181,10 +238,11 @@ bool ListBox::onProcessMessage(Message* msg)
             picked = pick(mousePos);
           }
 
-          /* if the picked widget is a child of the list, select it */
+          // If the picked widget is a child of the list, select it
           if (picked && hasChild(picked)) {
-            if (ListItem* pickedItem = dynamic_cast<ListItem*>(picked))
-              selectChild(pickedItem);
+            if (ListItem* pickedItem = dynamic_cast<ListItem*>(picked)) {
+              selectChild(pickedItem, msg);
+            }
           }
         }
 
@@ -270,7 +328,7 @@ bool ListBox::onProcessMessage(Message* msg)
             return Widget::onProcessMessage(msg);
         }
 
-        selectIndex(MID(0, select, bottom));
+        selectIndex(MID(0, select, bottom), msg);
         return true;
       }
       break;
diff --git a/src/ui/listbox.h b/src/ui/listbox.h
index e27c45071..0939c7dc6 100644
--- a/src/ui/listbox.h
+++ b/src/ui/listbox.h
@@ -11,6 +11,8 @@
 #include "obs/signal.h"
 #include "ui/widget.h"
 
+#include <vector>
+
 namespace ui {
 
   class ListItem;
@@ -19,13 +21,16 @@ namespace ui {
   public:
     ListBox();
 
+    bool isMultiselect() const { return m_multiselect; }
+    void setMultiselect(const bool multiselect);
+
     Widget* getSelectedChild();
     int getSelectedIndex();
 
-    void selectChild(Widget* item);
-    void selectIndex(int index);
+    void selectChild(Widget* item, Message* msg = nullptr);
+    void selectIndex(int index, Message* msg = nullptr);
 
-    std::size_t getItemsCount() const;
+    int getItemsCount() const;
 
     void makeChildVisible(Widget* item);
     void centerScroll();
@@ -41,6 +46,24 @@ namespace ui {
     virtual void onSizeHint(SizeHintEvent& ev) override;
     virtual void onChange();
     virtual void onDoubleClickItem();
+
+    int getChildIndex(Widget* item);
+    Widget* getChildByIndex(int index);
+
+    // True if this listbox accepts selecting multiple items at the
+    // same time.
+    bool m_multiselect;
+
+    // Range of items selected when we click down/up. Used to specify
+    // the range of selected items in a multiselect operation.
+    int m_firstSelectedIndex;
+    int m_lastSelectedIndex;
+
+    // Initial state (isSelected()) of each list item when the
+    // selection operation started. It's used to switch the state of
+    // items in case that the user is Ctrl+clicking items several
+    // items at the same time.
+    std::vector<bool> m_states;
   };
 
 } // namespace ui

From 4f279b3cc32b1080f2591e1decf8b15a14acfd19 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 09:04:10 -0300
Subject: [PATCH 22/77] Complete font.png Latin-1 Supplement Unicode block

---
 data/skins/default/font.png | Bin 9530 -> 9820 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/skins/default/font.png b/data/skins/default/font.png
index 5d50f5b9c8adabe9164c2aebaf039a4190974174..4eceb8bb27ec7dd3b4d4a2cb8f324b911bf8fb1d 100644
GIT binary patch
literal 9820
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
Lg<<JA=ZF6V{9_?4

literal 9530
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


From 4d897e182412dbd26cc2221e4f3ddf8c1dceaf2e Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 09:56:44 -0300
Subject: [PATCH 23/77] Fix memory leaks on KeyboardShortcutsCommand

---
 src/app/commands/cmd_keyboard_shortcuts.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index 53ca073de..076f5e5a9 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -62,7 +62,7 @@ public:
   KeyItem(const std::string& text, Key* key, AppMenuItem* menuitem, int level)
     : ListItem(text)
     , m_key(key)
-    , m_keyOrig(key ? new Key(*key): NULL)
+    , m_keyOrig(key ? new Key(*key): nullptr)
     , m_menuitem(menuitem)
     , m_level(level)
     , m_hotAccel(-1)
@@ -73,6 +73,10 @@ public:
     setBorder(border);
   }
 
+  ~KeyItem() {
+    delete m_keyOrig;
+  }
+
   Key* key() { return m_key; }
   AppMenuItem* menuitem() const { return m_menuitem; }
 

From b537b5261a8ba92a0cec061bafd97b5758dd986d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 14:29:42 -0300
Subject: [PATCH 24/77] Fix some characters in font.png

---
 data/skins/default/font.png | Bin 9820 -> 9848 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/skins/default/font.png b/data/skins/default/font.png
index 4eceb8bb27ec7dd3b4d4a2cb8f324b911bf8fb1d..87362d72d65249151aca3546cc17bf96e3d4a02c 100644
GIT binary patch
delta 6867
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
QANXUeZ>Cpp&guUD04-b{IRF3v

delta 6809
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


From 00099390daf9d24cae6910e3c67d43e15b7cc542 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:07:00 -0300
Subject: [PATCH 25/77] Fix several keyboard issues deadling with special
 characters/dead keys

This change adds support to write text with dead keys, and assign
keyboard shortcuts to special key combinations with Unicode characters
on macOS and Windows.

Fix #1083, close #796
---
 src/app/modules/gui.cpp           |   4 +-
 src/app/ui/select_accelerator.cpp |   5 +
 src/she/alleg4/key_poller.cpp     |   6 +-
 src/she/alleg4/she.cpp            |  12 +
 src/she/event.h                   |   4 +
 src/she/keys.h                    |  14 +-
 src/she/osx/view.h                |   2 +
 src/she/osx/view.mm               | 125 ++++++++--
 src/she/skia/skia_display.cpp     |   5 +
 src/she/skia/skia_display.h       |   2 +
 src/she/skia/skia_system.h        |   9 +
 src/she/skia/skia_window_osx.h    |   3 +-
 src/she/skia/skia_window_osx.mm   |  12 +
 src/she/skia/skia_window_x11.h    |   4 +
 src/she/system.h                  |   5 +
 src/she/win/event_queue.h         |  23 +-
 src/she/win/vk.cpp                |  41 +++-
 src/she/win/window.h              | 131 ++++++++--
 src/ui/accelerator.cpp            | 395 ++++++++++++------------------
 src/ui/accelerator.h              |   8 +-
 src/ui/entry.cpp                  |  37 ++-
 src/ui/entry.h                    |   3 +
 src/ui/int_entry.cpp              |   2 +-
 src/ui/manager.cpp                |   4 +
 src/ui/menu.cpp                   |  14 +-
 src/ui/message.cpp                |   5 +-
 src/ui/message.h                  |   7 +-
 27 files changed, 559 insertions(+), 323 deletions(-)

diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index 173124f6b..e45aa812a 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -383,6 +383,8 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
       break;
 
     case kKeyDownMessage: {
+      auto keymsg = static_cast<KeyMessage*>(msg);
+
 #ifdef _DEBUG
       // Ctrl+Shift+Q generates a crash (useful to test the anticrash feature)
       if (msg->ctrlPressed() &&
@@ -396,7 +398,7 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
       // Ctrl+Shift+R recover active sprite from the backup store
       if (msg->ctrlPressed() &&
           msg->shiftPressed() &&
-          static_cast<KeyMessage*>(msg)->scancode() == kKeyR &&
+          keymsg->scancode() == kKeyR &&
           App::instance()->dataRecovery() &&
           App::instance()->dataRecovery()->activeSession() &&
           current_editor &&
diff --git a/src/app/ui/select_accelerator.cpp b/src/app/ui/select_accelerator.cpp
index 9c20e8d4e..663f829c3 100644
--- a/src/app/ui/select_accelerator.cpp
+++ b/src/app/ui/select_accelerator.cpp
@@ -23,6 +23,7 @@ using namespace ui;
 class SelectAccelerator::KeyField : public ui::Entry {
 public:
   KeyField(const Accelerator& accel) : ui::Entry(256, "") {
+    setTranslateDeadKeys(false);
     setExpansive(true);
     setFocusMagnet(true);
     setAccel(accel);
@@ -38,9 +39,13 @@ public:
 protected:
   bool onProcessMessage(Message* msg) override {
     switch (msg->type()) {
+
       case kKeyDownMessage:
         if (hasFocus() && !isReadOnly()) {
           KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
+          if (!keymsg->scancode() && keymsg->unicodeChar() < 32)
+            break;
+
           KeyModifiers modifiers = keymsg->modifiers();
 
           if (keymsg->scancode() == kKeySpace)
diff --git a/src/she/alleg4/key_poller.cpp b/src/she/alleg4/key_poller.cpp
index 2a98b9464..ecc50d382 100644
--- a/src/she/alleg4/key_poller.cpp
+++ b/src/she/alleg4/key_poller.cpp
@@ -1,5 +1,5 @@
 // SHE library
-// Copyright (C) 2012-2015  David Capello
+// Copyright (C) 2012-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -21,14 +21,12 @@ int key_repeated[KEY_MAX];
 int she_keyboard_ucallback(int unicode_char, int* scancode)
 {
   int c = ((*scancode) & 0x7f);
-  Event ev;
 
+  Event ev;
   ev.setType(Event::KeyDown);
   ev.setScancode(static_cast<KeyScancode>(c));
   if (unicode_char > 0)
     ev.setUnicodeChar(unicode_char);
-  else
-    ev.setUnicodeChar(::scancode_to_ascii(c));
   ev.setRepeat(key_repeated[c]++);
   queue_event(ev);
 
diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp
index f0e828c4e..e2e1f5df0 100644
--- a/src/she/alleg4/she.cpp
+++ b/src/she/alleg4/she.cpp
@@ -206,6 +206,10 @@ public:
     return sur;
   }
 
+  void setTranslateDeadKeys(bool state) override {
+    // Do nothing
+  }
+
 };
 
 System* create_system() {
@@ -247,6 +251,14 @@ bool is_key_pressed(KeyScancode scancode)
   return key[scancode] ? true: false;
 }
 
+int get_unicode_from_scancode(KeyScancode scancode)
+{
+  if (is_key_pressed(scancode))
+    return scancode_to_ascii(scancode);
+  else
+    return false;
+}
+
 void clear_keyboard_buffer()
 {
   clear_keybuf();
diff --git a/src/she/event.h b/src/she/event.h
index ed9415e1d..f1c34624f 100644
--- a/src/she/event.h
+++ b/src/she/event.h
@@ -56,6 +56,7 @@ namespace she {
               m_scancode(kKeyNil),
               m_modifiers(kKeyUninitializedModifier),
               m_unicodeChar(0),
+              m_isDead(false),
               m_repeat(0),
               m_preciseWheel(false),
               m_pointerType(PointerType::Unknown),
@@ -70,6 +71,7 @@ namespace she {
     KeyScancode scancode() const { return m_scancode; }
     KeyModifiers modifiers() const { return m_modifiers; }
     int unicodeChar() const { return m_unicodeChar; }
+    bool isDeadKey() const { return m_isDead; }
     int repeat() const { return m_repeat; }
     gfx::Point position() const { return m_position; }
     gfx::Point wheelDelta() const { return m_wheelDelta; }
@@ -92,6 +94,7 @@ namespace she {
     void setScancode(KeyScancode scancode) { m_scancode = scancode; }
     void setModifiers(KeyModifiers modifiers) { m_modifiers = modifiers; }
     void setUnicodeChar(int unicodeChar) { m_unicodeChar = unicodeChar; }
+    void setDeadKey(bool state) { m_isDead = state; }
     void setRepeat(int repeat) { m_repeat = repeat; }
     void setPosition(const gfx::Point& pos) { m_position = pos; }
     void setWheelDelta(const gfx::Point& delta) { m_wheelDelta = delta; }
@@ -108,6 +111,7 @@ namespace she {
     KeyScancode m_scancode;
     KeyModifiers m_modifiers;
     int m_unicodeChar;
+    bool m_isDead;
     int m_repeat; // repeat=0 means the first time the key is pressed
     gfx::Point m_position;
     gfx::Point m_wheelDelta;
diff --git a/src/she/keys.h b/src/she/keys.h
index 5f7248342..8a3ced54e 100644
--- a/src/she/keys.h
+++ b/src/she/keys.h
@@ -1,5 +1,5 @@
 // SHE library
-// Copyright (C) 2012-2013, 2015  David Capello
+// Copyright (C) 2012-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -156,9 +156,17 @@ namespace she {
     kKeyScancodes    = 127
   };
 
-  // Deprecated API, use modifiers in she::Event
-  // TODO mark these functions as deprecated
+  // TODO move these functions to she::System
+
+  // Returns true if the the given scancode key is pressed/actived.
   bool is_key_pressed(KeyScancode scancode);
+
+  // Returns the latest unicode character that activated the given
+  // scancode.
+  int get_unicode_from_scancode(KeyScancode scancode);
+
+  // Clears the keyboard buffer (used only in the Allegro port).
+  // TODO (deprecated)
   void clear_keyboard_buffer();
 
 } // namespace she
diff --git a/src/she/osx/view.h b/src/she/osx/view.h
index 853a892cd..20ba5568d 100644
--- a/src/she/osx/view.h
+++ b/src/she/osx/view.h
@@ -53,6 +53,8 @@
 - (void)updateCurrentCursor;
 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender;
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender;
+- (void)doCommandBySelector:(SEL)selector;
+- (void)setTranslateDeadKeys:(BOOL)state;
 @end
 
 #endif
diff --git a/src/she/osx/view.mm b/src/she/osx/view.mm
index 2c4e2b9d7..8dd6d3e81 100644
--- a/src/she/osx/view.mm
+++ b/src/she/osx/view.mm
@@ -17,14 +17,18 @@
 #include "she/osx/generate_drop_files.h"
 #include "she/osx/window.h"
 
+#include <Carbon/Carbon.h>      // For VK codes
+
 using namespace she;
 
 namespace {
 
 // Internal array of pressed keys used in is_key_pressed()
-bool pressed_keys[kKeyScancodes];
+int g_pressedKeys[kKeyScancodes];
+bool g_translateDeadKeys = false;
+UInt32 g_lastDeadKeyState = 0;
 
-inline gfx::Point get_local_mouse_pos(NSView* view, NSEvent* event)
+gfx::Point get_local_mouse_pos(NSView* view, NSEvent* event)
 {
   NSPoint point = [view convertPoint:[event locationInWindow]
                             fromView:nil];
@@ -37,7 +41,7 @@ inline gfx::Point get_local_mouse_pos(NSView* view, NSEvent* event)
                     (view.bounds.size.height - point.y) / scale);
 }
 
-inline Event::MouseButton get_mouse_buttons(NSEvent* event)
+Event::MouseButton get_mouse_buttons(NSEvent* event)
 {
   // Some Wacom drivers on OS X report right-clicks with
   // buttonNumber=0, so we've to check the type event anyway.
@@ -61,7 +65,7 @@ inline Event::MouseButton get_mouse_buttons(NSEvent* event)
   return Event::MouseButton::NoneButton;
 }
 
-inline KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
+KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
 {
   int modifiers = kKeyNoneModifier;
   NSEventModifierFlags nsFlags = event.modifierFlags;
@@ -73,17 +77,43 @@ inline KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
   return (KeyModifiers)modifiers;
 }
 
-inline int get_unicodechar_from_nsevent(NSEvent* event)
+// Based on code from:
+// http://stackoverflow.com/questions/22566665/how-to-capture-unicode-from-key-events-without-an-nstextview
+// http://stackoverflow.com/questions/12547007/convert-key-code-into-key-equivalent-string
+// http://stackoverflow.com/questions/8263618/convert-virtual-key-code-to-unicode-string
+//
+// It includes a "translateDeadKeys" flag to avoid processing dead
+// keys in case that we want to use key
+CFStringRef get_unicode_from_key_code(NSEvent* event,
+                                      const bool translateDeadKeys)
 {
-  int chr = 0;
-  // TODO we should use "event.characters" for a new kind of event (Event::Char or something like that)
-  NSString* chars = event.charactersIgnoringModifiers;
-  if (chars && chars.length >= 1) {
-    chr = [chars characterAtIndex:0];
-    if (chr < 32)
-      chr = 0;
-  }
-  return chr;
+  TISInputSourceRef inputSource = TISCopyCurrentKeyboardInputSource();
+  CFDataRef keyLayoutData = (CFDataRef)TISGetInputSourceProperty(inputSource, kTISPropertyUnicodeKeyLayoutData);
+  const UCKeyboardLayout* keyLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(keyLayoutData);
+
+  UInt32 deadKeyState = (translateDeadKeys ? g_lastDeadKeyState: 0);
+  UniChar output[4];
+  UniCharCount length;
+
+  // Reference here:
+  // https://developer.apple.com/reference/coreservices/1390584-uckeytranslate?language=objc
+  UCKeyTranslate(
+    keyLayout,
+    event.keyCode,
+    kUCKeyActionDown,
+    ((event.modifierFlags >> 16) & 0xFF),
+    LMGetKbdType(),
+    (translateDeadKeys ? 0: kUCKeyTranslateNoDeadKeysMask),
+    &deadKeyState,
+    sizeof(output) / sizeof(output[0]),
+    &length,
+    output);
+
+  if (translateDeadKeys)
+    g_lastDeadKeyState = deadKeyState;
+
+  CFRelease(inputSource);
+  return CFStringCreateWithCharacters(kCFAllocatorDefault, output, length);
 }
 
 } // anonymous namespace
@@ -93,11 +123,19 @@ namespace she {
 bool is_key_pressed(KeyScancode scancode)
 {
   if (scancode >= 0 && scancode < kKeyScancodes)
-    return pressed_keys[scancode];
+    return (g_pressedKeys[scancode] != 0);
   else
     return false;
 }
 
+int get_unicode_from_scancode(KeyScancode scancode)
+{
+  if (scancode >= 0 && scancode < kKeyScancodes)
+    return g_pressedKeys[scancode];
+  else
+    return 0;
+}
+
 } // namespace she
 
 @implementation OSXView
@@ -167,17 +205,47 @@ bool is_key_pressed(KeyScancode scancode)
   [super keyDown:event];
 
   KeyScancode scancode = cocoavk_to_scancode(event.keyCode);
-  if (scancode >= 0 && scancode < kKeyScancodes)
-    pressed_keys[scancode] = true;
-
   Event ev;
   ev.setType(Event::KeyDown);
   ev.setScancode(scancode);
   ev.setModifiers(get_modifiers_from_nsevent(event));
   ev.setRepeat(event.ARepeat ? 1: 0);
-  ev.setUnicodeChar(get_unicodechar_from_nsevent(event));
+  ev.setUnicodeChar(0);
 
-  queue_event(ev);
+  bool sendMsg = true;
+
+  CFStringRef strRef = get_unicode_from_key_code(event, false);
+  if (strRef) {
+    int length = CFStringGetLength(strRef);
+    if (length == 1)
+      ev.setUnicodeChar(CFStringGetCharacterAtIndex(strRef, 0));
+    CFRelease(strRef);
+  }
+
+  if (scancode >= 0 && scancode < kKeyScancodes)
+    g_pressedKeys[scancode] = (ev.unicodeChar() ? ev.unicodeChar(): 1);
+
+  if (g_translateDeadKeys) {
+    strRef = get_unicode_from_key_code(event, true);
+    if (strRef) {
+      int length = CFStringGetLength(strRef);
+      if (length > 0) {
+        sendMsg = false;
+        for (int i=0; i<length; ++i) {
+          ev.setUnicodeChar(CFStringGetCharacterAtIndex(strRef, i));
+          queue_event(ev);
+        }
+        g_lastDeadKeyState = 0;
+      }
+      else {
+        ev.setDeadKey(true);
+      }
+      CFRelease(strRef);
+    }
+  }
+
+  if (sendMsg)
+    queue_event(ev);
 }
 
 - (void)keyUp:(NSEvent*)event
@@ -186,14 +254,14 @@ bool is_key_pressed(KeyScancode scancode)
 
   KeyScancode scancode = cocoavk_to_scancode(event.keyCode);
   if (scancode >= 0 && scancode < kKeyScancodes)
-    pressed_keys[scancode] = false;
+    g_pressedKeys[scancode] = 0;
 
   Event ev;
   ev.setType(Event::KeyUp);
   ev.setScancode(scancode);
   ev.setModifiers(get_modifiers_from_nsevent(event));
   ev.setRepeat(event.ARepeat ? 1: 0);
-  ev.setUnicodeChar(get_unicodechar_from_nsevent(event));
+  ev.setUnicodeChar(0);
 
   queue_event(ev);
 }
@@ -230,7 +298,7 @@ bool is_key_pressed(KeyScancode scancode)
         ((newFlags & flags[i]) != 0 ? Event::KeyDown:
                                       Event::KeyUp));
 
-      pressed_keys[scancodes[i]] = ((newFlags & flags[i]) != 0);
+      g_pressedKeys[scancodes[i]] = ((newFlags & flags[i]) != 0);
 
       ev.setScancode(scancodes[i]);
       ev.setModifiers(modifiers);
@@ -517,4 +585,15 @@ bool is_key_pressed(KeyScancode scancode)
     return NO;
 }
 
+- (void)doCommandBySelector:(SEL)selector
+{
+  // Do nothing (avoid beep pressing Escape key)
+}
+
+- (void)setTranslateDeadKeys:(BOOL)state
+{
+  g_translateDeadKeys = (state ? true: false);
+  g_lastDeadKeyState = 0;
+}
+
 @end
diff --git a/src/she/skia/skia_display.cpp b/src/she/skia/skia_display.cpp
index b0bf18df0..5032d4de9 100644
--- a/src/she/skia/skia_display.cpp
+++ b/src/she/skia/skia_display.cpp
@@ -184,6 +184,11 @@ void SkiaDisplay::setLayout(const std::string& layout)
   m_window.setLayout(layout);
 }
 
+void SkiaDisplay::setTranslateDeadKeys(bool state)
+{
+  m_window.setTranslateDeadKeys(state);
+}
+
 DisplayHandle SkiaDisplay::nativeHandle()
 {
   return (DisplayHandle)m_window.handle();
diff --git a/src/she/skia/skia_display.h b/src/she/skia/skia_display.h
index bc06c431a..b9ba96127 100644
--- a/src/she/skia/skia_display.h
+++ b/src/she/skia/skia_display.h
@@ -60,6 +60,8 @@ public:
   std::string getLayout() override;
   void setLayout(const std::string& layout) override;
 
+  void setTranslateDeadKeys(bool state);
+
   // Returns the HWND on Windows.
   DisplayHandle nativeHandle() override;
 
diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index adddf5abb..21a8e86d1 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -135,6 +135,15 @@ public:
     return loadSurface(filename);
   }
 
+  void setTranslateDeadKeys(bool state) override {
+    if (m_defaultDisplay)
+      m_defaultDisplay->setTranslateDeadKeys(state);
+
+#ifdef _WIN32
+    g_queue.setTranslateDeadKeys(state);
+#endif
+  }
+
 private:
   SkiaDisplay* m_defaultDisplay;
   bool m_gpuAcceleration;
diff --git a/src/she/skia/skia_window_osx.h b/src/she/skia/skia_window_osx.h
index e79e3a652..dc19263d9 100644
--- a/src/she/skia/skia_window_osx.h
+++ b/src/she/skia/skia_window_osx.h
@@ -1,5 +1,5 @@
 // SHE library
-// Copyright (C) 2012-2015  David Capello
+// Copyright (C) 2012-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -46,6 +46,7 @@ public:
   void updateWindow(const gfx::Rect& bounds);
   std::string getLayout() { return ""; }
   void setLayout(const std::string& layout) { }
+  void setTranslateDeadKeys(bool state);
   void* handle();
 
 private:
diff --git a/src/she/skia/skia_window_osx.mm b/src/she/skia/skia_window_osx.mm
index 85b6c9093..22f3ca786 100644
--- a/src/she/skia/skia_window_osx.mm
+++ b/src/she/skia/skia_window_osx.mm
@@ -15,6 +15,7 @@
 #include "gfx/size.h"
 #include "she/event.h"
 #include "she/event_queue.h"
+#include "she/osx/view.h"
 #include "she/osx/window.h"
 #include "she/skia/skia_display.h"
 #include "she/skia/skia_surface.h"
@@ -122,6 +123,11 @@ public:
     [view displayIfNeeded];
   }
 
+  void setTranslateDeadKeys(bool state) {
+    OSXView* view = (OSXView*)m_window.contentView;
+    [view setTranslateDeadKeys:(state ? YES: NO)];
+  }
+
   void* handle() {
     return (__bridge void*)m_window;
   }
@@ -450,6 +456,12 @@ void SkiaWindow::updateWindow(const gfx::Rect& bounds)
     m_impl->updateWindow(bounds);
 }
 
+void SkiaWindow::setTranslateDeadKeys(bool state)
+{
+  if (m_impl)
+    m_impl->setTranslateDeadKeys(state);
+}
+
 void* SkiaWindow::handle()
 {
   if (m_impl)
diff --git a/src/she/skia/skia_window_x11.h b/src/she/skia/skia_window_x11.h
index 18e34cd97..454b2f12c 100644
--- a/src/she/skia/skia_window_x11.h
+++ b/src/she/skia/skia_window_x11.h
@@ -44,6 +44,10 @@ public:
   std::string getLayout() { return ""; }
   void setLayout(const std::string& layout) { }
 
+  void setTranslateDeadKeys(bool state) {
+    // Do nothing
+  }
+
 private:
   void onExpose() override;
 
diff --git a/src/she/system.h b/src/she/system.h
index cce34ad29..b1359627a 100644
--- a/src/she/system.h
+++ b/src/she/system.h
@@ -49,6 +49,11 @@ namespace she {
     virtual Surface* loadRgbaSurface(const char* filename) = 0;
     virtual Font* loadSpriteSheetFont(const char* filename, int scale = 1) = 0;
     virtual Font* loadTrueTypeFont(const char* filename, int height) = 0;
+
+    // Indicates if you want to use dead keys or not. By default it's
+    // false, which behaves as regular shortcuts. You should set this
+    // to true when you're inside a text field in your app.
+    virtual void setTranslateDeadKeys(bool state) = 0;
   };
 
   System* create_system();
diff --git a/src/she/win/event_queue.h b/src/she/win/event_queue.h
index 0466d0376..381ce1587 100644
--- a/src/she/win/event_queue.h
+++ b/src/she/win/event_queue.h
@@ -1,5 +1,5 @@
 // SHE library
-// Copyright (C) 2012-2015  David Capello
+// Copyright (C) 2012-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -19,6 +19,9 @@ namespace she {
 
 class WinEventQueue : public EventQueue {
 public:
+  WinEventQueue() : m_translateDeadKeys(false) {
+  }
+
   void getEvent(Event& ev, bool canWait) override {
     MSG msg;
 
@@ -34,7 +37,18 @@ public:
       }
 
       if (res) {
-        TranslateMessage(&msg);
+        // Avoid transforming WM_KEYDOWN/UP into WM_DEADCHAR/WM_CHAR
+        // messages when m_translateDeadKeys is disabled.
+        //
+        // From MSDN TranslateMessage() documentation:
+        //   "WM_KEYDOWN and WM_KEYUP combinations produce a WM_CHAR
+        //   or WM_DEADCHAR message."
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/ms644955.aspx
+        if ((m_translateDeadKeys) ||
+            (msg.message != WM_KEYDOWN &&
+             msg.message != WM_KEYUP)) {
+          TranslateMessage(&msg);
+        }
         DispatchMessage(&msg);
       }
       else if (!canWait)
@@ -54,8 +68,13 @@ public:
     m_events.push(ev);
   }
 
+  void setTranslateDeadKeys(bool state) {
+    m_translateDeadKeys = state;
+  }
+
 private:
   std::queue<Event> m_events;
+  bool m_translateDeadKeys;
 };
 
 typedef WinEventQueue EventQueueImpl;
diff --git a/src/she/win/vk.cpp b/src/she/win/vk.cpp
index abab81426..06771922e 100644
--- a/src/she/win/vk.cpp
+++ b/src/she/win/vk.cpp
@@ -8,9 +8,7 @@
 #include "config.h"
 #endif
 
-#include "she/keys.h"
-
-#include <windows.h>
+#include "she/win/vk.h"
 
 namespace she {
 
@@ -337,6 +335,8 @@ static int scancode_to_win32vk(KeyScancode scancode)
   return keymap[scancode];
 }
 
+// TODO Move these functions to she::System class
+
 bool is_key_pressed(KeyScancode scancode)
 {
   int vk = scancode_to_win32vk(scancode);
@@ -346,4 +346,39 @@ bool is_key_pressed(KeyScancode scancode)
     return false;
 }
 
+int get_unicode_from_scancode(KeyScancode scancode)
+{
+  int vk = scancode_to_win32vk(scancode);
+  if (vk && (GetAsyncKeyState(vk) & 0x8000 ? true: false)) {
+    VkToUnicode tu;
+    if (tu) {
+      tu.toUnicode(vk, 0);
+      if (tu.size() > 0)
+        return tu[0];
+    }
+
+#if 0
+    BYTE keystate[256];
+    if (GetKeyboardState(&keystate[0])) {
+      WCHAR buffer[8];
+      int charsInBuffer = ToUnicode(vk, scancode, keystate, buffer,
+                                    sizeof(buffer)/sizeof(buffer[0]), 0);
+
+      // ToUnicode() returns -1 if there is dead-key waiting
+      if (charsInBuffer == -1) {
+        return buffer[0];
+      }
+      // ToUnicode returns several characters inside the buffer in
+      // case that a dead-key wasn't combined with the next pressed
+      // character.
+      else if (charsInBuffer > 0) {
+        // return buffer[charsInBuffer-1];
+        return buffer[0];
+      }
+    }
+#endif
+  }
+  return 0;
+}
+
 } // namespace she
diff --git a/src/she/win/window.h b/src/she/win/window.h
index 754954643..c20233088 100644
--- a/src/she/win/window.h
+++ b/src/she/win/window.h
@@ -17,11 +17,12 @@
 #include <sstream>
 
 #include "base/base.h"
+#include "base/debug.h"
 #include "gfx/size.h"
 #include "she/event.h"
-#include "she/keys.h"
 #include "she/native_cursor.h"
 #include "she/win/system.h"
+#include "she/win/vk.h"
 #include "she/win/window_dde.h"
 
 #ifndef WM_MOUSEHWHEEL
@@ -30,9 +31,6 @@
 
 namespace she {
 
-  KeyScancode win32vk_to_scancode(int vk);
-  KeyModifiers get_modifiers_from_last_win32_message();
-
   #define SHE_WND_CLASS_NAME L"Aseprite.Window"
 
   template<typename T>
@@ -42,6 +40,7 @@ namespace she {
       : m_clientSize(1, 1)
       , m_restoredSize(0, 0)
       , m_isCreated(false)
+      , m_translateDeadKeys(false)
       , m_hasMouse(false)
       , m_captureMouse(false)
       , m_hpenctx(nullptr)
@@ -321,6 +320,35 @@ namespace she {
       }
     }
 
+    void setTranslateDeadKeys(bool state) {
+      m_translateDeadKeys = state;
+
+      // Here we clear dead keys so we don't get those keys in the new
+      // "translate dead keys" state. E.g. If we focus a text entry
+      // field and the translation of dead keys is enabled, we don't
+      // want to get previous dead keys. The same in case we leave the
+      // text field with a pending dead key, that dead key must be
+      // discarded.
+      VkToUnicode tu;
+      if (tu) {
+        tu.toUnicode(VK_SPACE, 0);
+        if (tu.size() != 0)
+          tu.toUnicode(VK_SPACE, 0);
+      }
+#if 0
+      BYTE keystate[256];
+      if (GetKeyboardState(keystate)) {
+        WCHAR buffer[8];
+        int charsInBuffer =
+          ToUnicode(VK_SPACE, 0, keystate, buffer,
+                    sizeof(buffer)/sizeof(buffer[0]), 0);
+        if (charsInBuffer != 0)
+          ToUnicode(VK_SPACE, 0, keystate, buffer,
+                    sizeof(buffer)/sizeof(buffer[0]), 0);
+      }
+#endif
+    }
+
     HWND handle() {
       return m_hwnd;
     }
@@ -531,8 +559,6 @@ namespace she {
             (msg == WM_MOUSEWHEEL ? -z: 0));
           ev.setWheelDelta(delta);
 
-          //LOG("WHEEL: %d %d\n", delta.x, delta.y);
-
           queueEvent(ev);
           break;
         }
@@ -578,8 +604,6 @@ namespace she {
             (msg == WM_VSCROLL ? (z-50): 0));
           ev.setWheelDelta(delta);
 
-          //LOG("SCROLL: %d %d\n", delta.x, delta.y);
-
           SetScrollPos(m_hwnd, bar, 50, FALSE);
 
           queueEvent(ev);
@@ -590,34 +614,67 @@ namespace she {
         case WM_KEYDOWN: {
           int vk = wparam;
           int scancode = (lparam >> 16) & 0xff;
-          BYTE keystate[256];
-          WCHAR buffer[8];
-          int charsInBuffer = 0;
-
-          if (GetKeyboardState(&keystate[0])) {
-            // ToUnicode can return several characters inside the
-            // buffer in case that a dead-key wasn't combined with the
-            // next pressed character.
-            charsInBuffer = ToUnicode(vk, scancode, keystate, buffer,
-                                      sizeof(buffer)/sizeof(buffer[0]), 0);
-          }
+          bool sendMsg = true;
 
           Event ev;
           ev.setType(Event::KeyDown);
           ev.setModifiers(get_modifiers_from_last_win32_message());
           ev.setScancode(win32vk_to_scancode(vk));
+          ev.setUnicodeChar(0);
           ev.setRepeat(MAX(0, (lparam & 0xffff)-1));
 
-          if (charsInBuffer < 1) {
-            ev.setUnicodeChar(0);
-            queueEvent(ev);
-          }
-          else {
-            for (int i=0; i<charsInBuffer; ++i) {
-              ev.setUnicodeChar(buffer[i]);
-              queueEvent(ev);
+          if (!m_translateDeadKeys) {
+            VkToUnicode tu;
+            if (tu) {
+              tu.toUnicode(vk, scancode);
+              if (tu.isDeadKey()) {
+                ev.setUnicodeChar(tu[0]);
+                tu.toUnicode(vk, scancode); // Call again to remove dead-key
+              }
+              else if (tu.size() > 0) {
+                sendMsg = false;
+                for (int chr : tu) {
+                  ev.setUnicodeChar(chr);
+                  queueEvent(ev);
+                }
+              }
             }
+#if 0
+            BYTE keystate[256];
+            if (GetKeyboardState(keystate)) {
+              WCHAR buffer[8];
+
+              // ToUnicode can return several characters inside the
+              // buffer in case that a dead-key wasn't combined with the
+              // next pressed character.
+              int charsInBuffer =
+                ToUnicode(vk, scancode, keystate, buffer,
+                          sizeof(buffer)/sizeof(buffer[0]), 0);
+
+              // ToUnicode() returns -1 if there is dead-key waiting
+              if (charsInBuffer == -1) {
+                // Call again to remove dead-key
+                ToUnicode(vk, scancode, keystate, buffer,
+                          sizeof(buffer)/sizeof(buffer[0]), 0);
+                ev.setUnicodeChar(buffer[0]);
+              }
+              // ToUnicode returns several characters inside the buffer in
+              // case that a dead-key wasn't combined with the next pressed
+              // character.
+              else if (charsInBuffer > 0) {
+                sendMsg = false;
+                for (int i=0; i<charsInBuffer; ++i) {
+                  ev.setUnicodeChar(buffer[i]);
+                  queueEvent(ev);
+                }
+              }
+            }
+#endif
           }
+
+          if (sendMsg)
+            queueEvent(ev);
+
           return 0;
         }
 
@@ -636,6 +693,25 @@ namespace she {
           return 0;
         }
 
+        case WM_DEADCHAR: {
+          Event ev;
+          ev.setType(Event::KeyDown);
+          ev.setDeadKey(true);
+          ev.setUnicodeChar(wparam);
+          ev.setRepeat(lparam & 0xffff);
+          queueEvent(ev);
+          return 0;
+        }
+
+        case WM_CHAR: {
+          Event ev;
+          ev.setType(Event::KeyDown);
+          ev.setUnicodeChar(wparam);
+          ev.setRepeat(lparam & 0xffff);
+          queueEvent(ev);
+          return 0;
+        }
+
         case WM_MENUCHAR:
           // Avoid playing a sound when Alt+key is pressed and it's not in a native menu
           return MAKELONG(0, MNC_CLOSE);
@@ -856,6 +932,7 @@ namespace she {
     gfx::Size m_restoredSize;
     int m_scale;
     bool m_isCreated;
+    bool m_translateDeadKeys;
     bool m_hasMouse;
     bool m_captureMouse;
     bool m_customHcursor;
diff --git a/src/ui/accelerator.cpp b/src/ui/accelerator.cpp
index fc4c6a47a..6fb70b7d1 100644
--- a/src/ui/accelerator.cpp
+++ b/src/ui/accelerator.cpp
@@ -23,9 +23,6 @@
 
 #include <algorithm>
 
-// #define REPORT_KEYS
-#define PREPROCESS_KEYS
-
 namespace ui {
 
 #ifdef _WIN32
@@ -34,7 +31,117 @@ namespace ui {
   const char* kWinKeyName = "Super";
 #endif
 
-static KeyModifiers get_pressed_modifiers_from_she()
+namespace {
+
+const char* scancode_to_string[] = { // Same order that she::KeyScancode
+  nullptr,
+  "A",
+  "B",
+  "C",
+  "D",
+  "E",
+  "F",
+  "G",
+  "H",
+  "I",
+  "J",
+  "K",
+  "L",
+  "M",
+  "N",
+  "O",
+  "P",
+  "Q",
+  "R",
+  "S",
+  "T",
+  "U",
+  "V",
+  "W",
+  "X",
+  "Y",
+  "Z",
+  "0",
+  "1",
+  "2",
+  "3",
+  "4",
+  "5",
+  "6",
+  "7",
+  "8",
+  "9",
+  "0 Pad",
+  "1 Pad",
+  "2 Pad",
+  "3 Pad",
+  "4 Pad",
+  "5 Pad",
+  "6 Pad",
+  "7 Pad",
+  "8 Pad",
+  "9 Pad",
+  "F1",
+  "F2",
+  "F3",
+  "F4",
+  "F5",
+  "F6",
+  "F7",
+  "F8",
+  "F9",
+  "F10",
+  "F11",
+  "F12",
+  "Esc",
+  "~",
+  "-",
+  "=",
+  "Backspace",
+  "Tab",
+  "[",
+  "]",
+  "Enter",
+  ";",
+  "\'",
+  "\\",
+  "KEY_BACKSLASH2",
+  ",",
+  ".",
+  "/",
+  "Space",
+  "Ins",
+  "Del",
+  "Home",
+  "End",
+  "PgUp",
+  "PgDn",
+  "Left",
+  "Right",
+  "Up",
+  "Down",
+  "/ Pad",
+  "* Pad",
+  "- Pad",
+  "+ Pad",
+  "Del Pad",
+  "Enter Pad",
+  "PrtScr",
+  "Pause",
+  "KEY_ABNT_C1",
+  "Yen",
+  "Kana",
+  "KEY_CONVERT",
+  "KEY_NOCONVERT",
+  "KEY_AT",
+  "KEY_CIRCUMFLEX",
+  "KEY_COLON2",
+  "Kanji",
+};
+int scancode_to_string_size =
+  sizeof(scancode_to_string) / sizeof(scancode_to_string[0]);
+
+KeyModifiers get_pressed_modifiers_from_she()
 {
   KeyModifiers mods = kKeyNoneModifier;
   if (she::is_key_pressed(kKeyLShift)  ) mods = KeyModifiers(int(mods) | int(kKeyShiftModifier));
@@ -48,6 +155,8 @@ static KeyModifiers get_pressed_modifiers_from_she()
   return mods;
 }
 
+} // anonymous namespace
+
 Accelerator::Accelerator()
   : m_modifiers(kKeyNoneModifier)
   , m_scancode(kKeyNil)
@@ -111,36 +220,8 @@ Accelerator::Accelerator(const std::string& str)
         ASSERT(false && "Something wrong converting utf-8 to wchar string");
         continue;
       }
-
-      wchar_t wchr = wstr[0];
-      wchr = tolower(wchr);
-
-      if ((wchr >= 'a') && (wchr <= 'z')) {
-        m_unicodeChar = wchr;
-        m_scancode = (KeyScancode)((int)kKeyA + wchr - 'a');
-      }
-      else {
-        m_unicodeChar = wchr;
-
-        if ((wchr >= '0') && (wchr <= '9'))
-          m_scancode = (KeyScancode)((int)kKey0 + wchr - '0');
-        else {
-          switch (wchr) {
-            case '~': m_scancode = kKeyTilde; break;
-            case '-': m_scancode = kKeyMinus; break;
-            case '=': m_scancode = kKeyEquals; break;
-            case '[': m_scancode = kKeyOpenbrace; break;
-            case ']': m_scancode = kKeyClosebrace; break;
-            case ';': m_scancode = kKeyColon; break;
-            case '\'': m_scancode = kKeyQuote; break;
-            case '\\': m_scancode = kKeyBackslash; break;
-            case ',': m_scancode = kKeyComma; break;
-            case '.': m_scancode = kKeyStop; break;
-            case '/': m_scancode = kKeySlash; break;
-            case '*': m_scancode = kKeyAsterisk; break;
-          }
-        }
-      }
+      m_unicodeChar = std::tolower(wstr[0]);
+      m_scancode = kKeyNil;
     }
     // Other ones
     else {
@@ -218,19 +299,8 @@ Accelerator::Accelerator(const std::string& str)
 
 bool Accelerator::operator==(const Accelerator& other) const
 {
-  if (m_modifiers != other.m_modifiers)
-    return false;
-
-  if (m_scancode == other.m_scancode) {
-    if (m_scancode != kKeyNil)
-      return true;
-    else if (m_unicodeChar != 0)
-      return (std::tolower(m_unicodeChar) == std::tolower(other.m_unicodeChar));
-    else               // Only comparing modifiers, and they are equal
-      return true;
-  }
-
-  return false;
+  // TODO improve this, avoid conversion to std::string
+  return toString() == other.toString();
 }
 
 bool Accelerator::isEmpty() const
@@ -243,114 +313,6 @@ bool Accelerator::isEmpty() const
 
 std::string Accelerator::toString() const
 {
-  // Same order that she::KeyScancode
-  static const char* table[] = {
-    NULL,
-    "A",
-    "B",
-    "C",
-    "D",
-    "E",
-    "F",
-    "G",
-    "H",
-    "I",
-    "J",
-    "K",
-    "L",
-    "M",
-    "N",
-    "O",
-    "P",
-    "Q",
-    "R",
-    "S",
-    "T",
-    "U",
-    "V",
-    "W",
-    "X",
-    "Y",
-    "Z",
-    "0",
-    "1",
-    "2",
-    "3",
-    "4",
-    "5",
-    "6",
-    "7",
-    "8",
-    "9",
-    "0 Pad",
-    "1 Pad",
-    "2 Pad",
-    "3 Pad",
-    "4 Pad",
-    "5 Pad",
-    "6 Pad",
-    "7 Pad",
-    "8 Pad",
-    "9 Pad",
-    "F1",
-    "F2",
-    "F3",
-    "F4",
-    "F5",
-    "F6",
-    "F7",
-    "F8",
-    "F9",
-    "F10",
-    "F11",
-    "F12",
-    "Esc",
-    "~",
-    "-",
-    "=",
-    "Backspace",
-    "Tab",
-    "[",
-    "]",
-    "Enter",
-    ";",
-    "\'",
-    "\\",
-    "KEY_BACKSLASH2",
-    ",",
-    ".",
-    "/",
-    "Space",
-    "Ins",
-    "Del",
-    "Home",
-    "End",
-    "PgUp",
-    "PgDn",
-    "Left",
-    "Right",
-    "Up",
-    "Down",
-    "/ Pad",
-    "* Pad",
-    "- Pad",
-    "+ Pad",
-    "Del Pad",
-    "Enter Pad",
-    "PrtScr",
-    "Pause",
-    "KEY_ABNT_C1",
-    "Yen",
-    "Kana",
-    "KEY_CONVERT",
-    "KEY_NOCONVERT",
-    "KEY_AT",
-    "KEY_CIRCUMFLEX",
-    "KEY_COLON2",
-    "Kanji",
-  };
-  static std::size_t table_size = sizeof(table) / sizeof(table[0]);
-
   std::string buf;
 
   // Shifts
@@ -367,11 +329,12 @@ std::string Accelerator::toString() const
   // Key
   if (m_unicodeChar) {
     std::wstring wideUnicodeChar;
-    wideUnicodeChar.push_back((wchar_t)toupper(m_unicodeChar));
+    wideUnicodeChar.push_back((wchar_t)std::toupper(m_unicodeChar));
     buf += base::to_utf8(wideUnicodeChar);
   }
-  else if (m_scancode && m_scancode > 0 && m_scancode < (int)table_size)
-    buf += table[m_scancode];
+  else if (m_scancode > 0 &&
+           m_scancode < scancode_to_string_size)
+    buf += scancode_to_string[m_scancode];
   else if (!buf.empty() && buf[buf.size()-1] == '+')
     buf.erase(buf.size()-1);
 
@@ -380,97 +343,51 @@ std::string Accelerator::toString() const
 
 bool Accelerator::isPressed(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar) const
 {
-  // Preprocess the character to be compared with the accelerator
-#ifdef PREPROCESS_KEYS
-  // Directly scancode
-  if ((scancode >= kKeyF1 && scancode <= kKeyF12) ||
-      (scancode == kKeyEsc) ||
-      (scancode == kKeyBackspace) ||
-      (scancode == kKeyTab) ||
-      (scancode == kKeyEnter) ||
-      (scancode == kKeyBackslash) ||
-      (scancode == kKeyBackslash2) ||
-      (scancode >= kKeySpace && scancode <= kKeyDown) ||
-      (scancode >= kKeyEnterPad && scancode <= kKeyNoconvert) ||
-      (scancode == kKeyKanji)) {
-    unicodeChar = 0;
-  }
-  // For Ctrl+number
-  /*           scancode    unicodeChar
-     Ctrl+0    27          0
-     Ctrl+1    28          2
-     Ctrl+2    29          0
-     Ctrl+3    30          27
-     Ctrl+4    31          28
-     Ctrl+5    32          29
-     Ctrl+6    33          30
-     Ctrl+7    34          31
-     Ctrl+8    35          127
-     Ctrl+9    36          2
-   */
-  else if ((scancode >= kKey0 && scancode <= kKey9) &&
-           (unicodeChar < 32 || unicodeChar == 127)) {
-    unicodeChar = '0' + scancode - kKey0;
-    scancode = kKeyNil;
-  }
-  // For Ctrl+letter
-  else if (unicodeChar >= 1 && unicodeChar <= 'z'-'a'+1) {
-    unicodeChar = 'a'+unicodeChar-1;
-    scancode = kKeyNil;
-  }
-  // For any other legal Unicode code
-  else if (unicodeChar >= ' ') {
-    unicodeChar = std::tolower(unicodeChar);
-
-    /* without shift (because characters like '*' can be trigger with
-       "Shift+8", so we don't want "Shift+*") */
-    if (!(unicodeChar >= 'a' && unicodeChar <= 'z'))
-      modifiers = (KeyModifiers)((int)modifiers & ((int)~kKeyShiftModifier));
-
-    scancode = kKeyNil;
-  }
-#endif
-
-#ifdef REPORT_KEYS
-  printf("%3d==%3d %3d==%3d %s==%s ",
-    m_scancode, scancode,
-    m_unicodeChar, unicodeChar,
-    toString().c_str(),
-    Accelerator(modifiers, scancode, unicodeChar).toString().c_str());
-#endif
-
-  if ((m_modifiers == modifiers) &&
-      ((m_scancode != kKeyNil && m_scancode == scancode) ||
-       (m_unicodeChar && m_unicodeChar == unicodeChar) ||
-       (m_scancode == kKeyNil && scancode == kKeyNil && !m_unicodeChar && !unicodeChar))) {
-#ifdef REPORT_KEYS
-    printf("true\n");
-    fflush(stdout);
-#endif
-    return true;
-  }
-
-#ifdef REPORT_KEYS
-  printf("false\n");
-  fflush(stdout);
-#endif
-  return false;
+  return ((scancode && *this == Accelerator(modifiers, scancode, 0)) ||
+          (unicodeChar && *this == Accelerator(modifiers, kKeyNil, unicodeChar)));
 }
 
 bool Accelerator::isPressed() const
 {
-  KeyModifiers modifiers = get_pressed_modifiers_from_she();
+  KeyModifiers pressedModifiers = get_pressed_modifiers_from_she();
 
-  return ((m_scancode == 0 || she::is_key_pressed(m_scancode)) &&
-          (m_modifiers == modifiers));
+  // Check if this shortcut is only
+  if (m_scancode == kKeyNil && m_unicodeChar == 0)
+    return (m_modifiers == pressedModifiers);
+
+  // Compare with all pressed scancodes
+  for (int s=int(kKeyNil); s<int(kKeyFirstModifierScancode); ++s) {
+    if (she::is_key_pressed(KeyScancode(s)) &&
+        isPressed(pressedModifiers,
+                  KeyScancode(s),
+                  she::get_unicode_from_scancode(KeyScancode(s))))
+      return true;
+  }
+
+  return false;
 }
 
 bool Accelerator::isLooselyPressed() const
 {
-  KeyModifiers modifiers = get_pressed_modifiers_from_she();
+  KeyModifiers pressedModifiers = get_pressed_modifiers_from_she();
 
-  return ((m_scancode == 0 || she::is_key_pressed(m_scancode)) &&
-          (int(m_modifiers & modifiers) == m_modifiers));
+  if ((m_modifiers & pressedModifiers) != m_modifiers)
+    return false;
+
+  // Check if this shortcut is only
+  if (m_scancode == kKeyNil && m_unicodeChar == 0)
+    return true;
+
+  // Compare with all pressed scancodes
+  for (int s=int(kKeyNil); s<int(kKeyFirstModifierScancode); ++s) {
+    if (she::is_key_pressed(KeyScancode(s)) &&
+        isPressed(m_modifiers,  // Use same modifiers (we've already compared the modifiers)
+                  KeyScancode(s),
+                  she::get_unicode_from_scancode(KeyScancode(s))))
+      return true;
+  }
+
+  return false;
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/ui/accelerator.h b/src/ui/accelerator.h
index 3bfd58667..5afcf618a 100644
--- a/src/ui/accelerator.h
+++ b/src/ui/accelerator.h
@@ -17,6 +17,7 @@ namespace ui {
 
   extern const char* kWinKeyName;
 
+  // TODO rename this class to Shortcut
   class Accelerator {
   public:
     Accelerator();
@@ -29,12 +30,12 @@ namespace ui {
 
     bool isPressed(KeyModifiers modifiers, KeyScancode scancode, int unicodeChar) const;
 
-    // Returns true if the key is pressed and only its modifiers are
+    // Returns true if the key is pressed and ONLY its modifiers are
     // pressed.
     bool isPressed() const;
 
-    // Returns true if the key is pressed and the accelerator
-    // modifiers are pressed (other modifiers are allowed).
+    // Returns true if the key + its modifiers are pressed (other
+    // modifiers are allowed too).
     bool isLooselyPressed() const;
 
     bool operator==(const Accelerator& other) const;
@@ -52,6 +53,7 @@ namespace ui {
     int m_unicodeChar;
   };
 
+  // TODO rename this class to Shortcuts
   class Accelerators {
   public:
     typedef std::vector<Accelerator> List;
diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index 4c71b3c43..24d59c70f 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -14,6 +14,7 @@
 #include "base/string.h"
 #include "clip/clip.h"
 #include "she/font.h"
+#include "she/system.h"
 #include "ui/manager.h"
 #include "ui/menu.h"
 #include "ui/message.h"
@@ -41,6 +42,7 @@ Entry::Entry(std::size_t maxsize, const char* format, ...)
   , m_password(false)
   , m_recent_focused(false)
   , m_lock_selection(false)
+  , m_translate_dead_keys(true)
 {
   enableFlags(CTRL_RIGHT_CLICK);
 
@@ -165,6 +167,11 @@ void Entry::setSuffix(const std::string& suffix)
   invalidate();
 }
 
+void Entry::setTranslateDeadKeys(bool state)
+{
+  m_translate_dead_keys = state;
+}
+
 void Entry::getEntryThemeInfo(int* scroll, int* caret, int* state,
                               int* selbeg, int* selend)
 {
@@ -213,6 +220,10 @@ bool Entry::onProcessMessage(Message* msg)
         selectAllText();
         m_recent_focused = true;
       }
+
+      // Start processing dead keys
+      if (m_translate_dead_keys)
+        she::instance()->setTranslateDeadKeys(true);
       break;
 
     case kFocusLeaveMessage:
@@ -224,6 +235,10 @@ bool Entry::onProcessMessage(Message* msg)
         deselectText();
 
       m_recent_focused = false;
+
+      // Stop processing dead keys
+      if (m_translate_dead_keys)
+        she::instance()->setTranslateDeadKeys(false);
       break;
 
     case kKeyDownMessage:
@@ -300,20 +315,24 @@ bool Entry::onProcessMessage(Message* msg)
               }
             }
             else if (manager()->isFocusMovementKey(msg)) {
-              break;
-            }
-            else if (keymsg->unicodeChar() >= 32) {
-              // Ctrl and Alt must be unpressed to insert a character
-              // in the text-field.
-              if ((msg->modifiers() & (kKeyCtrlModifier | kKeyAltModifier)) == 0) {
-                cmd = EntryCmd::InsertChar;
-              }
+              return Widget::onProcessMessage(msg);
             }
             break;
         }
 
-        if (cmd == EntryCmd::NoOp)
+        if (cmd == EntryCmd::NoOp) {
+          if (keymsg->unicodeChar() >= 32) {
+            executeCmd(EntryCmd::InsertChar, keymsg->unicodeChar(),
+                       (msg->shiftPressed()) ? true: false);
+
+            // Select dead-key
+            if (keymsg->isDeadKey()) {
+              selectText(m_caret-1, m_caret);
+            }
+            return true;
+          }
           break;
+        }
 
         executeCmd(cmd, keymsg->unicodeChar(),
                    (msg->shiftPressed()) ? true: false);
diff --git a/src/ui/entry.h b/src/ui/entry.h
index eaad41c74..52c3adcf0 100644
--- a/src/ui/entry.h
+++ b/src/ui/entry.h
@@ -37,6 +37,8 @@ namespace ui {
     void setSuffix(const std::string& suffix);
     const std::string& getSuffix() { return m_suffix; }
 
+    void setTranslateDeadKeys(bool state);
+
     // for themes
     void getEntryThemeInfo(int* scroll, int* caret, int* state,
                            int* selbeg, int* selend);
@@ -95,6 +97,7 @@ namespace ui {
     bool m_password;
     bool m_recent_focused;
     bool m_lock_selection;
+    bool m_translate_dead_keys;
     std::string m_suffix;
   };
 
diff --git a/src/ui/int_entry.cpp b/src/ui/int_entry.cpp
index 77ab25d2d..bb083acbb 100644
--- a/src/ui/int_entry.cpp
+++ b/src/ui/int_entry.cpp
@@ -118,7 +118,7 @@ bool IntEntry::onProcessMessage(Message* msg)
       if (hasFocus() && !isReadOnly()) {
         KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
         int chr = keymsg->unicodeChar();
-        if (chr < '0' || chr > '9') {
+        if (chr && (chr < '0' || chr > '9')) {
           // By-pass Entry::onProcessMessage()
           return Widget::onProcessMessage(msg);
         }
diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index f087ccf59..de23ce344 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -317,6 +317,10 @@ void Manager::generateMessagesFromSheEvents()
           sheEvent.modifiers(),
           sheEvent.unicodeChar(),
           sheEvent.repeat());
+
+        if (sheEvent.isDeadKey())
+          static_cast<KeyMessage*>(msg)->setDeadKey(true);
+
         broadcastKeyMsg(msg);
         enqueueMessage(msg);
         break;
diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index 99a2e18e8..74527d8b9 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -485,9 +485,15 @@ bool MenuBox::onProcessMessage(Message* msg)
         if (((this->type() == kMenuBoxWidget) && (msg->modifiers() == kKeyNoneModifier || // <-- Inside menu-boxes we can use letters without Alt modifier pressed
                                                   msg->modifiers() == kKeyAltModifier)) ||
             ((this->type() == kMenuBarWidget) && (msg->modifiers() == kKeyAltModifier))) {
-          // TODO use scancode instead of unicodeChar
-          selected = check_for_letter(menu,
-            static_cast<KeyMessage*>(msg)->unicodeChar());
+          int unicode = static_cast<KeyMessage*>(msg)->unicodeChar();
+          selected = check_for_letter(menu, unicode);
+          if (!selected) {
+            KeyScancode scancode = static_cast<KeyMessage*>(msg)->scancode();
+            if (scancode >= kKeyA && scancode <= kKeyZ)
+              selected = check_for_letter(menu, 'a' + scancode - kKeyA);
+            else if (scancode >= kKey0 && scancode <= kKey9)
+              selected = check_for_letter(menu, '0' + scancode - kKey0);
+          }
 
           if (selected) {
             menu->highlightItem(selected, true, true, true);
@@ -1196,7 +1202,7 @@ static MenuItem* check_for_letter(Menu* menu, int ascii)
 
     MenuItem* menuitem = static_cast<MenuItem*>(child);
     int mnemonic = menuitem->mnemonicChar();
-    if (mnemonic > 0 && mnemonic == tolower(ascii))
+    if (mnemonic > 0 && mnemonic == std::tolower(ascii))
       return menuitem;
   }
   return NULL;
diff --git a/src/ui/message.cpp b/src/ui/message.cpp
index 75596921e..6134ba850 100644
--- a/src/ui/message.cpp
+++ b/src/ui/message.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -11,6 +11,7 @@
 #include "ui/message.h"
 
 #include "base/memory.h"
+#include "she/system.h"
 #include "ui/manager.h"
 #include "ui/widget.h"
 
@@ -29,6 +30,7 @@ Message::Message(MessageType type, KeyModifiers modifiers)
       ((she::is_key_pressed(kKeyLShift) || she::is_key_pressed(kKeyRShift) ? kKeyShiftModifier: 0) |
        (she::is_key_pressed(kKeyLControl) || she::is_key_pressed(kKeyRControl) ? kKeyCtrlModifier: 0) |
        (she::is_key_pressed(kKeyAlt) ? kKeyAltModifier: 0) |
+       (she::is_key_pressed(kKeyAltGr) ? (kKeyCtrlModifier | kKeyAltModifier): 0) |
        (she::is_key_pressed(kKeyCommand) ? kKeyCmdModifier: 0) |
        (she::is_key_pressed(kKeySpace) ? kKeySpaceModifier: 0) |
        (she::is_key_pressed(kKeyLWin) || she::is_key_pressed(kKeyRWin) ? kKeyWinModifier: 0));
@@ -84,6 +86,7 @@ KeyMessage::KeyMessage(MessageType type,
   , m_scancode(scancode)
   , m_unicodeChar(unicodeChar)
   , m_repeat(repeat)
+  , m_isDead(false)
   , m_propagate_to_children(false)
   , m_propagate_to_parent(true)
 {
diff --git a/src/ui/message.h b/src/ui/message.h
index 01cff4873..d78f75166 100644
--- a/src/ui/message.h
+++ b/src/ui/message.h
@@ -74,6 +74,8 @@ namespace ui {
     KeyScancode scancode() const { return m_scancode; }
     int unicodeChar() const { return m_unicodeChar; }
     int repeat() const { return m_repeat; }
+    bool isDeadKey() const { return m_isDead; }
+    void setDeadKey(bool state) { m_isDead = state; }
     bool propagateToChildren() const { return m_propagate_to_children; }
     bool propagateToParent() const { return m_propagate_to_parent; }
     void setPropagateToChildren(bool flag) { m_propagate_to_children = flag; }
@@ -83,8 +85,9 @@ namespace ui {
     KeyScancode m_scancode;
     int m_unicodeChar;
     int m_repeat; // repeat=0 means the first time the key is pressed
-    bool m_propagate_to_children : 1;
-    bool m_propagate_to_parent : 1;
+    bool m_isDead;
+    bool m_propagate_to_children;
+    bool m_propagate_to_parent;
   };
 
   class PaintMessage : public Message {

From b244700e4ba3699fd503816181b6dfd10f7d76c3 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:11:32 -0300
Subject: [PATCH 26/77] Remove invalid forward declaration of __argc/__wargv on
 MSVC15

---
 src/she/skia/she.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/she/skia/she.cpp b/src/she/skia/she.cpp
index a6be689cb..0a904ba29 100644
--- a/src/she/skia/she.cpp
+++ b/src/she/skia/she.cpp
@@ -51,9 +51,6 @@ void clear_keyboard_buffer()
 extern int app_main(int argc, char* argv[]);
 
 #if _WIN32
-extern int __argc;
-extern wchar_t** __wargv;
-
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     PWSTR lpCmdLine, int nCmdShow) {
   int argc = __argc;

From bc3e4ba3db204767599460d884b39714fe6749c1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:18:50 -0300
Subject: [PATCH 27/77] Fix memory leaks in KeyboardShortcutsWindow

---
 src/app/commands/cmd_keyboard_shortcuts.cpp | 44 +++++++++++++--------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp
index 076f5e5a9..35320e251 100644
--- a/src/app/commands/cmd_keyboard_shortcuts.cpp
+++ b/src/app/commands/cmd_keyboard_shortcuts.cpp
@@ -385,6 +385,10 @@ public:
     }
   }
 
+  ~KeyboardShortcutsWindow() {
+    deleteAllKeyItems();
+  }
+
   void restoreKeys() {
     for (KeyItem* keyItem : m_allKeyItems) {
       keyItem->restoreKeys();
@@ -393,21 +397,12 @@ public:
 
 private:
   void deleteAllKeyItems() {
-    while (searchList()->lastChild())
-      searchList()->removeChild(searchList()->lastChild());
-    while (menus()->lastChild())
-      menus()->removeChild(menus()->lastChild());
-    while (commands()->lastChild())
-      commands()->removeChild(commands()->lastChild());
-    while (tools()->lastChild())
-      tools()->removeChild(tools()->lastChild());
-    while (actions()->lastChild())
-      actions()->removeChild(actions()->lastChild());
-
-    for (KeyItem* keyItem : m_allKeyItems) {
-      delete keyItem;
-    }
-    m_allKeyItems.clear();
+    deleteList(searchList());
+    deleteList(menus());
+    deleteList(commands());
+    deleteList(tools());
+    deleteList(actions());
+    ASSERT(m_allKeyItems.empty());
   }
 
   void fillAllLists() {
@@ -472,9 +467,21 @@ private:
     updateViews();
   }
 
+  void deleteList(Widget* listbox) {
+    while (listbox->lastChild()) {
+      Widget* item = listbox->lastChild();
+      listbox->removeChild(item);
+
+      auto it = std::find(m_allKeyItems.begin(), m_allKeyItems.end(), item);
+      if (it != m_allKeyItems.end())
+        m_allKeyItems.erase(it);
+
+      delete item;
+    }
+  }
+
   void fillSearchList(const std::string& search) {
-    while (searchList()->lastChild())
-      searchList()->removeChild(searchList()->lastChild());
+    deleteList(searchList());
 
     std::vector<std::string> parts;
     base::split_string(base::string_to_lower(search), parts, " ");
@@ -508,6 +515,8 @@ private:
               new KeyItem(itemText,
                           keyItem->key(),
                           keyItem->menuitem(), 0);
+
+            m_allKeyItems.push_back(copyItem);
             searchList()->addChild(copyItem);
           }
         }
@@ -590,6 +599,7 @@ private:
           menuItem->text().c_str(),
           menuItem->key(), menuItem, level);
 
+        m_allKeyItems.push_back(keyItem);
         listbox->addChild(keyItem);
 
         if (menuItem->hasSubmenu())

From e5769d166618846c2dd7f5c038e84ea907b4c891 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:21:33 -0300
Subject: [PATCH 28/77] Remove dead code that was replaced with VkToUnicode

---
 src/she/win/vk.cpp   | 21 ---------------------
 src/she/win/window.h | 43 -------------------------------------------
 2 files changed, 64 deletions(-)

diff --git a/src/she/win/vk.cpp b/src/she/win/vk.cpp
index 06771922e..6c56fb1f8 100644
--- a/src/she/win/vk.cpp
+++ b/src/she/win/vk.cpp
@@ -356,27 +356,6 @@ int get_unicode_from_scancode(KeyScancode scancode)
       if (tu.size() > 0)
         return tu[0];
     }
-
-#if 0
-    BYTE keystate[256];
-    if (GetKeyboardState(&keystate[0])) {
-      WCHAR buffer[8];
-      int charsInBuffer = ToUnicode(vk, scancode, keystate, buffer,
-                                    sizeof(buffer)/sizeof(buffer[0]), 0);
-
-      // ToUnicode() returns -1 if there is dead-key waiting
-      if (charsInBuffer == -1) {
-        return buffer[0];
-      }
-      // ToUnicode returns several characters inside the buffer in
-      // case that a dead-key wasn't combined with the next pressed
-      // character.
-      else if (charsInBuffer > 0) {
-        // return buffer[charsInBuffer-1];
-        return buffer[0];
-      }
-    }
-#endif
   }
   return 0;
 }
diff --git a/src/she/win/window.h b/src/she/win/window.h
index c20233088..5b0810470 100644
--- a/src/she/win/window.h
+++ b/src/she/win/window.h
@@ -335,18 +335,6 @@ namespace she {
         if (tu.size() != 0)
           tu.toUnicode(VK_SPACE, 0);
       }
-#if 0
-      BYTE keystate[256];
-      if (GetKeyboardState(keystate)) {
-        WCHAR buffer[8];
-        int charsInBuffer =
-          ToUnicode(VK_SPACE, 0, keystate, buffer,
-                    sizeof(buffer)/sizeof(buffer[0]), 0);
-        if (charsInBuffer != 0)
-          ToUnicode(VK_SPACE, 0, keystate, buffer,
-                    sizeof(buffer)/sizeof(buffer[0]), 0);
-      }
-#endif
     }
 
     HWND handle() {
@@ -639,37 +627,6 @@ namespace she {
                 }
               }
             }
-#if 0
-            BYTE keystate[256];
-            if (GetKeyboardState(keystate)) {
-              WCHAR buffer[8];
-
-              // ToUnicode can return several characters inside the
-              // buffer in case that a dead-key wasn't combined with the
-              // next pressed character.
-              int charsInBuffer =
-                ToUnicode(vk, scancode, keystate, buffer,
-                          sizeof(buffer)/sizeof(buffer[0]), 0);
-
-              // ToUnicode() returns -1 if there is dead-key waiting
-              if (charsInBuffer == -1) {
-                // Call again to remove dead-key
-                ToUnicode(vk, scancode, keystate, buffer,
-                          sizeof(buffer)/sizeof(buffer[0]), 0);
-                ev.setUnicodeChar(buffer[0]);
-              }
-              // ToUnicode returns several characters inside the buffer in
-              // case that a dead-key wasn't combined with the next pressed
-              // character.
-              else if (charsInBuffer > 0) {
-                sendMsg = false;
-                for (int i=0; i<charsInBuffer; ++i) {
-                  ev.setUnicodeChar(buffer[i]);
-                  queueEvent(ev);
-                }
-              }
-            }
-#endif
           }
 
           if (sendMsg)

From 9ef139318463cf85d5f28e827f214cd94b455abf Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:24:28 -0300
Subject: [PATCH 29/77] Add missing she/win/vk.h file

---
 src/she/win/vk.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/she/win/vk.h

diff --git a/src/she/win/vk.h b/src/she/win/vk.h
new file mode 100644
index 000000000..c29dcf7d3
--- /dev/null
+++ b/src/she/win/vk.h
@@ -0,0 +1,59 @@
+// SHE library
+// Copyright (C) 2012-2016  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef SHE_WIN_VK_H_INCLUDED
+#define SHE_WIN_VK_H_INCLUDED
+#pragma once
+
+#include <windows.h>
+
+#include "she/keys.h"
+
+namespace she {
+
+  KeyScancode win32vk_to_scancode(int vk);
+  KeyModifiers get_modifiers_from_last_win32_message();
+
+  class VkToUnicode {
+  public:
+    VkToUnicode() : m_size(0) {
+      m_ok = (GetKeyboardState(&m_keystate[0]) ? true: false);
+    }
+
+    void toUnicode(int vk, int scancode) {
+      // ToUnicode returns several characters inside the buffer in
+      // case that a dead-key wasn't combined with the next pressed
+      // character.
+      m_size =
+        ToUnicode(vk, scancode, m_keystate, m_buffer,
+                  sizeof(m_buffer)/sizeof(m_buffer[0]), 0);
+    }
+
+    operator bool() { return m_ok; }
+    int size() const { return ABS(m_size); }
+    LPCWSTR begin() const { return m_buffer; }
+    LPCWSTR end() const { return m_buffer+size(); }
+
+    int operator[](const int i) {
+      ASSERT(i >= 0 && i < size());
+      return m_buffer[i];
+    }
+
+    // ToUnicode() returns -1 if there is dead key waiting
+    bool isDeadKey() const {
+      return (m_size == -1);
+    }
+
+  private:
+    bool m_ok;
+    BYTE m_keystate[256];
+    WCHAR m_buffer[8];
+    int m_size;
+  };
+
+} // namespace she
+
+#endif

From f43ef44d740e69e13bf7d04e1d06ee1c20ba7fa9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Nov 2016 18:42:31 -0300
Subject: [PATCH 30/77] Change shadow colors in ase/doc icons

---
 data/icons/ase16.png | Bin 191 -> 190 bytes
 data/icons/ase32.png | Bin 255 -> 259 bytes
 data/icons/ase48.png | Bin 308 -> 314 bytes
 data/icons/ase64.png | Bin 372 -> 378 bytes
 data/icons/doc16.png | Bin 198 -> 189 bytes
 data/icons/doc32.png | Bin 298 -> 272 bytes
 data/icons/doc48.png | Bin 362 -> 328 bytes
 data/icons/doc64.png | Bin 432 -> 397 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/icons/ase16.png b/data/icons/ase16.png
index 2389bef4f92e85f59da228d7a7821023a329b36d..e5324125304f847d67ed11f075544db51c110944 100644
GIT binary patch
delta 162
zcmdnbxQ}syN`0%Ri(`mIZ*odQ)15V&+T_>AUpE$Dv~Y2iR`-9M)xiBEZK~;#Hno51
zVj%MTSuJM?hpw~~X9*yf(NSn**KoCA%LbK2M>3u_HJT?}TUF`OdGQ=;ie!L!rQO9@
z6RvK0FiGJgtIVQBz50CeYEhTF54TH#jF$wNkSN_G^3=_Xf#G#it9Z_q@9hjg;OXk;
Jvd$@?2>^O2K^g!6

delta 163
zcmdnTxSw%?N`0HBi(`mIZ*odQ(=E@>QgJeNG3OmvCT!T6n{&=PtAYE9->mBsq-On?
z9|0owmtC@HVO)~oX4cXO1f3G<kC`KQJ-EG<yn4#?Br2HG*3NRDBJnoHVH#uU<mbX`
zIU{ws^*ATRC?saz{_*HT;v&<%7Bw>*4_(_f5oCa%jG9Ma-VzoD2EBW2)6M6|x-tNP
Mr>mdKI;Vst03t3zOaK4?

diff --git a/data/icons/ase32.png b/data/icons/ase32.png
index 5af641971d442a393f4f8222b991c4c8004d6a33..da6c764594caa5b6955caa65d401703359543550 100644
GIT binary patch
delta 231
zcmey**vvFRrT&zsi(^PcYjTPM^UlarULGK@kK4b_efnaSf{rdTBLf2ipLy4=Ht3vl
z@%28z*ki!9>wNm!S?;0Tmkv#mkdQENPWsT|kd^VMo{jC*ZyDJGPD$Th{p{i4X;xry
zlXcj_3{>{uqdRY@igiO+!WG8Fd=jM$+#9(%*D8Cg^=3=30je^1#n2NIU|wm*3<S=>
zc}k(WO*6as*y1@3FzAT~OY_VVXxMr^UdArw{DA`p6cV$&L%ZW-?0S;;d3Y)~3>I<s
e?AZ5EgMmT)pM`-;lujB05O})!xvX<aXaWGWvQuaP

delta 227
zcmV<90382=0{;P!B!9+9L_t(oh3%I?4uUWcMSqQl;4(di>}di!y@85)1KD8$dpSlg
z!!2}S#^?}}qC;rnycH=8|Me46YQWf@n-Tze@Av%PFC^9;0N}K7<?HxDGUOW!UGSCH
z*G4p`NF9J-6Y(^Vud*8;zj6*Wap_tEM9_c=1Pc_Yd%i!3d0e9fra}c&Kn0ee6GQii
zv3tqv4XA($48DS0)dB#H>r6C=p38}^0pgRfH1RY*|Lb%vNURkN>b-x<LHB5Q_67_e
d_`9>AatD|4Iy(F4RXYFx002ovPDHLkV1i==W%2+3

diff --git a/data/icons/ase48.png b/data/icons/ase48.png
index 90352b0a6446445369b0725e4747fab1595636b5..9583341ff1f4847d27348726b1addcf09aa7b5b7 100644
GIT binary patch
delta 288
zcmV+*0pI?#0=fc_BYyz_Nkl<ZXo2mSF$%&!5Jg?F@B#rZlVfNfK?@<RrAABJfQ5qT
z^%#4ZKrWC@t6eAHNMy|pALdmPlE6Ivu-UL?#E@^cg{#}9*>leg$uvn0t}f4~;?pzZ
zXx$71ynvw>+}K?1w}>shSud8p=Eey=0eFGV2(9MX)74UA!+$}?>H4UA-|z{jfHW!~
z%_QVyx-$H_YK6Q@flojMq)`EBR6rUPkVXZh3EB&V>|y@(#|NK)3P_^@(x`wm@B-|I
zY*$vkKIU1JX1?{n0iOW8K(D<}pD3k(PXJz^GeYzns<zgjk<HRHW>22lT3^%NDDVlu
m3mEQ(p43MIUKv190(k*1wK>>-bmL9{0000<MNUMnLSTY7$%Zlj

delta 282
zcmV+#0p<R>0<;2<BYyz<Nkl<ZXo2mSK@Ng25Jjo+5L~9m&^;u&(;KL$H_)9Xu$N=>
zGTZ`JEkoiMOr?{b%v%isl6m=)Qc{yK9By^x>(03o_uQQ1)}DQR-Ivv;XBNr2nF)9S
zLoc|odA#a`Ee&kfWvIDvf=>WmU^GITRnhxeYHT>@I6d1Y^nVSXfC@;X0@5sFUZyL<
zud7zfyA=2YR6rUPkVXZhQ2}XGK$@t%P|P0YUw?e?38;WHDj<ytNCPjxe#nmZCe)W*
zk))Y#J#fG$0533UFEk}eDc}=;7Z{BYJ%^%aWVy8|dkS>Ug_`!3wZllmCjc*CxEp#>
gp9pvXMTz7M@DtcO;)_}MSO5S307*qoM6N<$f}qBH<^TWy

diff --git a/data/icons/ase64.png b/data/icons/ase64.png
index 4d16e4282924a44cc3fe2ed2795ef36c84323de2..1624dd8dae364a756ef07ff8afa622dc50ba68d6 100644
GIT binary patch
delta 351
zcmeyu^owbNO1-0}i(^Q|oVT+LxeghKw1vv-X?T!Y#dBA*L?A|XtJN+pKCWG_4Xb80
zi5FbnTFKgM@-X;w{cY{2egF0xF*AKTt^H`t%<$L8|L*%%+rH%b`}|d3|7|#ZzjmMS
z)o1Jh3|km{Z_9n?{rUK-Oyo+*%@>cXtSxr>B)fnigK^d^83WnA`uSIX-9EmD-&%c6
zp7`@wlixG2I&fdmV2EmPW4yp*a`%Gzmi@bZ-zz)KKR>C49WKt*AhsY7XnHTx0@e%>
z23?26AQK<FW?VS`dh-719{ZSKf>J2v-Aix0`tQ+|+ea;C`EaaR-~S}S+5u#b{Cf5p
zt7H4-K7nwzS|0eff1eIl`u+n7r<1Hr7wK><-*!FO6Jl)eZT*Cc`wrT>19duaIDTS^
X@VERn>56I$0}yz+`njxgN@xNA=Yg76

literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^shaSW-L^LF-G-X;eDw}TNa
zX9L>qsa~92_Mo1<>axrGAhxp?TH|gi7CPTJ8~nX`yP=m{e40C>`FWe1bKh%s=e??W
z{+s9I5)Hn$zqaUopMTH3E9*0}218VX+IIaP*ZzF1>|bNj^K?x~)_ot3eas>Zx(=6T
zGIqcGb9LSR+Oxkm7(WcNom1=wky*@;!6?P*z<r^|S^h%Zd%nN2g1;)JJ+XFRyuf6_
z)gZPYkYNi$FVh0n43If+)hzqv1%6f8ek<<8rS$P$u^Vx6ezh@Y7oTi7@aq@MCBN$&
z?wfvlt8$+aWctf948Q+Z?T$|f64^MH?c$ZK!M8u3)GBXNg-X8>-;i<t!F-UtiY*G2
Z%$0X-7)<9`#sWi=!PC{xWt~$(69CEtnf?F(

diff --git a/data/icons/doc16.png b/data/icons/doc16.png
index be0174b74a1bb0bc63155d09316f5e07d5f2c512..b3ee801d76d066c523e2a31d237ca48f0e1ace8e 100644
GIT binary patch
delta 161
zcmV;S0AByb0lfi`B!7fSL_t(Ijbmhhg4EE&{|tmd<LuS*8?efxh9>^U1z>Wip^5)f
zLlaR9U?Rd+IGD9+9s>gdLp`z~BpHBg2#n8yO;K7{5=<eA7&btZ3nXl9;WUg*k^xP*
ziEtXmCdmMN0ILD${>LRoI~NQs15grD-Q@X{8SvupVTufBBpO*a0|Ns9cdbEpr<tft
P00000NkvXXu0mjfkElP~

delta 170
zcmV;b09F6J0mcE4B!7)bL_t(Ijbmhhg4EE&{|p3xgsp93b6!#dR>{=R#Q(SeOfEGv
z@qg{4c_;=j5waB-%vv>%;l<&@^~i>hWB{@uFg^=5MQLG446|0v!w|y;h;o61tu35}
zu}LzZDK`;L!`LJlfDd3b0Nww%#AxS&p=AI{LaLiQpE3hp93wtVz5x=pwv8m|Tn%w8
Y07d0VQ_OwuDF6Tf07*qoM6N<$f(zM4aR2}S

diff --git a/data/icons/doc32.png b/data/icons/doc32.png
index a4bafdb01f294259c6e383c0f0108da29c869fa7..2bfe477fa2c89610664261364bd0f65d870f51eb 100644
GIT binary patch
delta 244
zcmV<Q01N-B0+0fbB!AaQL_t(oh3%F-4uUWoN1w*Qk;TL#a0!kfJ0y0~BM9gb+!%1@
z8eD=SIC=wJ=s;sbL4<1hk`Ddk$ICyI1q%CJ^i;<Nk^y+Wp8~8m8vriHxV30G(!&O`
z(oN)L(d!@)#;tuKj1z!IT?61j`fi`S20le+0>#Aa2EHC3FKr8HBWc>S0lF}*0kz7z
z)|v7<2D;b=0RZ=^YV{>@T;+cZoDUHIqIpx<mk3)8xB$jAV0t_Dy+vm?-~zY+E`ST5
u{Suz8w@CunYe4r0Gd5Nl$fgW1yMY&fR5M#eGl<au0000<MNUMnLSTZuY-d&g

delta 271
zcmV+q0r38i0;&R#B!BTqL_t(oh3%I=4uUWghkqId!dwzA(__dkiQV)DD(Ve%bI{#u
za1u5X7#Y}ffEOr90|b;m={NCskM{AUp=E)b&1y}TAM}93`3V5hDDnZov~2*uW#>tC
z%RVOSf}u*>UyoJ;3D=XJ6Rvjz0Ecq`g^B$&%ae)m8t973M1K;7ez|VG28gN&lQF-X
zpN@g*DzB?kk;btUPsczVw94N>AjJgTuQDG4=WVu^i2O|{Cd60`=mr|Efu_4-+g)^U
z1G)j-fNnrHp!^aZZqL6oFdhRYV*rXXo9YD96`F?_j{(E702F_<zaj}kDIVOw7mU<H
Vg6HO^TL1t600>D%PDHLkV1lfbcc=gW

diff --git a/data/icons/doc48.png b/data/icons/doc48.png
index 208651b2b4767c97d54ae575e8130c5de526e840..f6e913b15dc1801a86d8cf2f46b0ee9495535e56 100644
GIT binary patch
delta 301
zcmV+|0n+~J0>}c8B!3S{L_t(&f$f;P4Z<)Gh7F>iOcRL_vP8xpeInrwMt}rHpre4E
zHL^rTpkxE6Vy=jT!Er9XbYFF{oyVv9<veD}!e*VnY;ysq+9FDlvaOeKY!;k$MdyL@
zfHyS?@B#~$MVI?^kc;W;69alqofU_+em0F6kCZCEofEzT@P7hM5ekh<oRlR_@Ew2`
zm_&pqwm2z?&_wZyknO?r>#;t-cK}{s)Lm$mrlx+>b>}#RuCW2%0eFE?BXr#6rq(1L
zbey6kLI8*WH}C>pyO7Vv{!l*(;5#4!+=u`-BEXFZa3ccThyXY60#2{f`|~aIef$l4
z2jB&qBINRmk0uNF4!{faMX2hTn+)(BfERcJ=IS!KhBw2700000NkvXXu0mjf6}yQt

delta 335
zcmV-V0kHna0_p;gB!4kUL_t(&f$f?x4uUWghS4w(W=OaU$B<nTyXg&7)EnsLpu5-L
zB;8D4WMI>Y@<>Wjg;M^c-}HQWmHzqvfHW=~!e+ImA3x4SL~(p->bfYhruM>6%v^S<
zbnQ~(z9s=)fU7cee?3OI7)#n1(C=hPdTi<_jzyowX@70!X@8vH9e@|06d~QH#Hr#u
zldXk!0A9c>B1GwnlNSV;Y#!bLcmabV)c0Web*&0@SxWox4!{eT^e#jnOz%9G_9=9x
z4|oUQ1xy;D^R|8CV<aB5PhmDf09XO0ffq37E;Qt2f2@N7cn7Qi(^vtfu>wqE1(?PP
zFpU*p8h8OpKS-w!x2NuX{0+PV@B%s!@`6Cr^fXxIh)*|kZxnb3;01Id<odp-=^rrW
hK*hPV5AOiHfG<u)L!!<rP`v;E002ovPDHLkV1gXrn4bUu

diff --git a/data/icons/doc64.png b/data/icons/doc64.png
index 5e64313739a7966e2da31cf4c3a982476e5b8d65..19869ab1e228a8d02edb01aa96f0f6927165982b 100644
GIT binary patch
delta 341
zcmdnM+{-*cr9Q;d#WAE}&f8grd50VXT&H(5O=9a*F5r|`ez#GiyntoHVZj$cDz)n#
zdKa`z+39#m@x54FSmg7Yv;Ob8%J=Q^^@=Tr;&yQ8pZ`5S;;jAUZ{n}-u6wyYe0Fbm
zjb&J~c=ah2(`XR}U5Cv+e-GY%{#!z>{MDuUw8Ouzrk1{2zdzr+KEM8L%;X~b&$0^`
zG8kt)k#v}BB^;BYHsd`5s{{9iGkI(+N79-u^GLWcUSKl0neOmL=l}KBPmk5GYcNDL
zq!m4H$PKJ`y?&ka9e&Q&$xvNBd2D;+zTMl!H}7SEy~>*Y#C^;lH!KF)AO$it#h(31
zUAe`#-5#HrWEV`fWK?no$<2E5pT+-rzoCu6neqmv1*{p9(j8uzTLd46SoUn9<b`A2
i&$@r|1u$%3IIFKT+vwKzs})HMK;Y@>=d#Wzp$PzMSD3{B

delta 376
zcmeBW-oQLTrM}$L#WAE}&fD3Bd50VXTp0r+uDCrivSa(=*tPo!n<vj5g_l7pwd)Rg
z-cfY)bevu?v3$a{sKnQaXY21)<$nGl)gQJ-vY)5_G<)@n>v9T_B1e~5?vv>cEuM4s
z`N5yNpO=2Ao7}gDt($29YsRvb;x+$jzCQfuzmscz<nPL-S%0t9%jkD0&Dd`H@Tu*d
zd*4{Ti!NZuV4U?t&SCN`;d7<2N8df)$0Wj_>tMV?E+O+ZXXL!_jj!*9H-L<@de4}f
z{WJRg^ixkuy3Xxh&%o-yec{ess{`wv^8c<axtDZ4|8Om<218WCvv*YozG>c>u5s2l
z_qp!3KW29zCIAf<cUTOv@Z5FA*!QyE_KLrRShskx3Zqi!<Ug|?ygptoFDLO%+kx={
zlS#O(!s*WmIrlev*Rr=CtCR2k%@x3~h2d-{|BQ2K2XFifFVC3s+RExZ#E{SIZMn{e
T9*X=>VgLe9S3j3^P6<r_U_G#@


From 2f987ac3c3c610858a49fa5ad911b6e76f4a03e8 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 09:21:46 -0300
Subject: [PATCH 31/77] Minor: sort filenames in pixman CMakeLists.txt file

---
 third_party/pixman-cmake/CMakeLists.txt | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/third_party/pixman-cmake/CMakeLists.txt b/third_party/pixman-cmake/CMakeLists.txt
index 02def7aff..bb84c95c7 100644
--- a/third_party/pixman-cmake/CMakeLists.txt
+++ b/third_party/pixman-cmake/CMakeLists.txt
@@ -20,33 +20,33 @@ include_directories(
   ${CMAKE_BINARY_DIR})
 
 add_library(pixman
-  ../pixman/pixman/pixman.c
-  ../pixman/pixman/pixman-access.c
   ../pixman/pixman/pixman-access-accessors.c
-  ../pixman/pixman/pixman-bits-image.c
-  ../pixman/pixman/pixman-combine32.c
-  ../pixman/pixman/pixman-combine-float.c
-  ../pixman/pixman/pixman-conical-gradient.c
-  ../pixman/pixman/pixman-filter.c
-  ../pixman/pixman/pixman-x86.c
-  ../pixman/pixman/pixman-mips.c
+  ../pixman/pixman/pixman-access.c
   ../pixman/pixman/pixman-arm.c
-  ../pixman/pixman/pixman-ppc.c
-  ../pixman/pixman/pixman-edge.c
+  ../pixman/pixman/pixman-bits-image.c
+  ../pixman/pixman/pixman-combine-float.c
+  ../pixman/pixman/pixman-combine32.c
+  ../pixman/pixman/pixman-conical-gradient.c
   ../pixman/pixman/pixman-edge-accessors.c
+  ../pixman/pixman/pixman-edge.c
   ../pixman/pixman/pixman-fast-path.c
-  ../pixman/pixman/pixman-glyph.c
+  ../pixman/pixman/pixman-filter.c
   ../pixman/pixman/pixman-general.c
+  ../pixman/pixman/pixman-glyph.c
   ../pixman/pixman/pixman-gradient-walker.c
   ../pixman/pixman/pixman-image.c
   ../pixman/pixman/pixman-implementation.c
   ../pixman/pixman/pixman-linear-gradient.c
   ../pixman/pixman/pixman-matrix.c
+  ../pixman/pixman/pixman-mips.c
   ../pixman/pixman/pixman-noop.c
+  ../pixman/pixman/pixman-ppc.c
   ../pixman/pixman/pixman-radial-gradient.c
   ../pixman/pixman/pixman-region16.c
   ../pixman/pixman/pixman-region32.c
   ../pixman/pixman/pixman-solid-fill.c
   ../pixman/pixman/pixman-timer.c
   ../pixman/pixman/pixman-trap.c
-  ../pixman/pixman/pixman-utils.c)
+  ../pixman/pixman/pixman-utils.c
+  ../pixman/pixman/pixman-x86.c
+  ../pixman/pixman/pixman.c)

From 08bb51e3583452920e8071edddbcafe5a9a79d5b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 09:38:25 -0300
Subject: [PATCH 32/77] Merge all she::instance() implementations

Only she::create_system() must be provided by the platform impl.
---
 src/main/main.cpp      |  2 +-
 src/she/CMakeLists.txt |  3 ++-
 src/she/alleg4/she.cpp | 16 +++-------------
 src/she/skia/she.cpp   |  9 +--------
 src/she/system.cpp     | 23 +++++++++++++++++++++++
 src/tests/test.h       |  4 ++--
 6 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 src/she/system.cpp

diff --git a/src/main/main.cpp b/src/main/main.cpp
index d2f99f467..69943d811 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -66,7 +66,7 @@ int app_main(int argc, char* argv[])
     MemLeak memleak;
     base::SystemConsole systemConsole;
     app::AppOptions options(argc, const_cast<const char**>(argv));
-    she::ScopedHandle<she::System> system(she::create_system());
+    she::ScopedHandle<she::System> system(she::instance());
     app::App app;
 
     // Change the name of the memory dump file
diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
index d1d92f084..3360e5c3d 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
@@ -2,7 +2,8 @@
 # Copyright (C) 2012-2016  David Capello
 
 set(SHE_SOURCES
-  common/freetype_font.cpp)
+  common/freetype_font.cpp
+  system.cpp)
 
 ######################################################################
 # Allegro 4 backend
diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp
index e2e1f5df0..2771ac533 100644
--- a/src/she/alleg4/she.cpp
+++ b/src/she/alleg4/she.cpp
@@ -63,8 +63,6 @@
   #include "she/alleg4/mouse_poller.h"
 #endif
 
-static she::System* g_instance = nullptr;
-
 namespace she {
 
 class Alleg4EventQueue : public EventQueue {
@@ -129,15 +127,11 @@ public:
 #ifdef USE_MOUSE_POLLER
     mouse_poller_init();
 #endif
-
-    g_instance = this;
   }
 
   ~Alleg4System() {
     remove_timer();
     allegro_exit();
-
-    g_instance = nullptr;
   }
 
   void dispose() override {
@@ -216,15 +210,11 @@ System* create_system() {
   return new Alleg4System();
 }
 
-System* instance()
-{
-  return g_instance;
-}
-
 void error_message(const char* msg)
 {
-  if (g_instance && g_instance->logger())
-    g_instance->logger()->logError(msg);
+  System* sys = instance();
+  if (sys && sys->logger())
+    sys->logger()->logError(msg);
 
 #ifdef _WIN32
   std::wstring wmsg = base::from_utf8(msg);
diff --git a/src/she/skia/she.cpp b/src/she/skia/she.cpp
index 0a904ba29..f95cc2c00 100644
--- a/src/she/skia/she.cpp
+++ b/src/she/skia/she.cpp
@@ -24,15 +24,8 @@
 
 namespace she {
 
-static System* g_instance;
-
 System* create_system() {
-  return g_instance = new SkiaSystem();
-}
-
-System* instance()
-{
-  return g_instance;
+  return new SkiaSystem();
 }
 
 void error_message(const char* msg)
diff --git a/src/she/system.cpp b/src/she/system.cpp
new file mode 100644
index 000000000..2b746792b
--- /dev/null
+++ b/src/she/system.cpp
@@ -0,0 +1,23 @@
+// SHE library
+// Copyright (C) 2016  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "she/system.h"
+
+namespace she {
+
+System* instance()
+{
+  static System* sys = nullptr;
+  if (!sys)
+    sys = create_system();
+  return sys;
+}
+
+} // namespace she
diff --git a/src/tests/test.h b/src/tests/test.h
index 210dc4ecc..9896066e8 100644
--- a/src/tests/test.h
+++ b/src/tests/test.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -38,7 +38,7 @@ int main(int argc, char* argv[])
   #ifdef TEST_GUI
     {
       // Do not create a she::System, as we don't need it for testing purposes.
-      //she::ScopedHandle<she::System> system(she::create_system());
+      //she::ScopedHandle<she::System> system(she::instance());
       ui::UISystem uiSystem;
       ui::Manager uiManager;
   #endif

From d8d9f8072c65fa786e5b8f624320fb404c096af9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 10:27:43 -0300
Subject: [PATCH 33/77] Fix compiling tests with dynamic libc on MSVC

---
 CMakeLists.txt | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f83b1a26f..7ec1276a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,9 +163,16 @@ else()
   add_definitions(-DNDEBUG)
 endif()
 
-# Fix to compile gtest with VC11 (2012)
-if(MSVC_VERSION EQUAL 1700)
-  add_definitions(-D_VARIADIC_MAX=10)
+if(MSVC)
+  if(USE_STATIC_LIBC)
+    if(CMAKE_BUILD_TYPE STREQUAL Debug)
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MTd")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MTd")
+    else()
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MT")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MT")
+    endif()
+  endif()
 endif()
 
 if(NOT WIN32 AND NOT APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -438,6 +445,10 @@ if(ENABLE_MEMLEAK)
   add_definitions(-DLAF_MEMLEAK)
 endif()
 
+if(NOT USE_STATIC_LIBC)
+  set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib.")
+endif()
+
 set(LAF_WITH_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable LAF tests")
 add_subdirectory(laf)
 

From 5dc8f9c8a0aaaebce47ff41421650735a2570edb Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 11:15:02 -0300
Subject: [PATCH 34/77] Move keyboard functions to she::System

---
 src/app/ui/editor/editor.cpp |  2 +-
 src/app/ui/timeline.cpp      |  6 ++--
 src/she/alleg4/she.cpp       | 56 +++++++++++++++++-------------------
 src/she/common/system.h      | 19 ++++++++++++
 src/she/keys.h               | 13 ---------
 src/she/osx/system.h         | 31 ++++++++++++++++++++
 src/she/osx/view.mm          |  9 +++---
 src/she/skia/she.cpp         |  5 ----
 src/she/skia/skia_system.h   |  3 +-
 src/she/system.h             | 16 +++++++++++
 src/she/win/system.h         | 11 +++++++
 src/she/win/vk.cpp           |  6 ++--
 src/she/x11/keys.cpp         |  7 ++++-
 src/she/x11/system.h         | 31 ++++++++++++++++++++
 src/ui/accelerator.cpp       | 29 ++++++-------------
 src/ui/message.cpp           | 17 ++---------
 16 files changed, 167 insertions(+), 94 deletions(-)
 create mode 100644 src/she/osx/system.h
 create mode 100644 src/she/x11/system.h

diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index be9c83bbe..2992eba9b 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -1345,7 +1345,7 @@ bool Editor::onProcessMessage(Message* msg)
     case kFocusLeaveMessage:
       // As we use keys like Space-bar as modifier, we can clear the
       // keyboard buffer when we lost the focus.
-      she::clear_keyboard_buffer();
+      she::instance()->clearKeyboardBuffer();
       break;
 
     case kMouseWheelMessage:
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 1979a46dc..52976605a 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -47,6 +47,7 @@
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "she/font.h"
+#include "she/system.h"
 #include "ui/scroll_helper.h"
 #include "ui/ui.h"
 
@@ -335,7 +336,8 @@ bool Timeline::onProcessMessage(Message* msg)
       if (!m_document)
         break;
 
-      if (mouseMsg->middle() || she::is_key_pressed(kKeySpace)) {
+      if (mouseMsg->middle() ||
+          she::instance()->isKeyPressed(kKeySpace)) {
         captureMouse();
         m_state = STATE_SCROLLING;
         m_oldPos = static_cast<MouseMessage*>(msg)->position();
@@ -847,7 +849,7 @@ bool Timeline::onProcessMessage(Message* msg)
           m_scroll = false;
 
           // We have to clear all the kKeySpace keys in buffer.
-          she::clear_keyboard_buffer();
+          she::instance()->clearKeyboardBuffer();
           used = true;
           break;
         }
diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp
index 2771ac533..4c08f2d72 100644
--- a/src/she/alleg4/she.cpp
+++ b/src/she/alleg4/she.cpp
@@ -200,6 +200,33 @@ public:
     return sur;
   }
 
+  bool isKeyPressed(KeyScancode scancode) override {
+#ifdef ALLEGRO_UNIX
+    if (scancode == kKeyLShift || scancode == kKeyRShift) {
+      return key_shifts & KB_SHIFT_FLAG;
+    }
+    else if (scancode == kKeyLControl || scancode == kKeyRControl) {
+      return key_shifts & KB_CTRL_FLAG;
+    }
+    else if (scancode == kKeyAlt) {
+      return key_shifts & KB_ALT_FLAG;
+    }
+#endif
+    return key[scancode] ? true: false;
+  }
+
+
+  int getUnicodeFromScancode(KeyScancode scancode) override {
+    if (isKeyPressed(scancode))
+      return scancode_to_ascii(scancode);
+    else
+      return false;
+  }
+
+  void clearKeyboardBuffer() override {
+    clear_keybuf();
+  }
+
   void setTranslateDeadKeys(bool state) override {
     // Do nothing
   }
@@ -225,35 +252,6 @@ void error_message(const char* msg)
 #endif
 }
 
-bool is_key_pressed(KeyScancode scancode)
-{
-#ifdef ALLEGRO_UNIX
-  if (scancode == kKeyLShift || scancode == kKeyRShift) {
-    return key_shifts & KB_SHIFT_FLAG;
-  }
-  else if (scancode == kKeyLControl || scancode == kKeyRControl) {
-    return key_shifts & KB_CTRL_FLAG;
-  }
-  else if (scancode == kKeyAlt) {
-    return key_shifts & KB_ALT_FLAG;
-  }
-#endif
-  return key[scancode] ? true: false;
-}
-
-int get_unicode_from_scancode(KeyScancode scancode)
-{
-  if (is_key_pressed(scancode))
-    return scancode_to_ascii(scancode);
-  else
-    return false;
-}
-
-void clear_keyboard_buffer()
-{
-  clear_keybuf();
-}
-
 } // namespace she
 
 // It must be defined by the user program code.
diff --git a/src/she/common/system.h b/src/she/common/system.h
index 54097eb20..ad9d9ba18 100644
--- a/src/she/common/system.h
+++ b/src/she/common/system.h
@@ -78,6 +78,25 @@ public:
     return loadFreeTypeFont(filename, height);
   }
 
+  KeyModifiers keyModifiers() override {
+    return
+      (KeyModifiers)
+      ((isKeyPressed(kKeyLShift) ||
+        isKeyPressed(kKeyRShift) ? kKeyShiftModifier: 0) |
+       (isKeyPressed(kKeyLControl) ||
+        isKeyPressed(kKeyRControl) ? kKeyCtrlModifier: 0) |
+       (isKeyPressed(kKeyAlt) ? kKeyAltModifier: 0) |
+       (isKeyPressed(kKeyAltGr) ? (kKeyCtrlModifier | kKeyAltModifier): 0) |
+       (isKeyPressed(kKeyCommand) ? kKeyCmdModifier: 0) |
+       (isKeyPressed(kKeySpace) ? kKeySpaceModifier: 0) |
+       (isKeyPressed(kKeyLWin) ||
+        isKeyPressed(kKeyRWin) ? kKeyWinModifier: 0));
+  }
+
+  void clearKeyboardBuffer() override {
+    // Do nothing
+  }
+
 private:
   NativeDialogs* m_nativeDialogs;
 };
diff --git a/src/she/keys.h b/src/she/keys.h
index 8a3ced54e..1bab36311 100644
--- a/src/she/keys.h
+++ b/src/she/keys.h
@@ -156,19 +156,6 @@ namespace she {
     kKeyScancodes    = 127
   };
 
-  // TODO move these functions to she::System
-
-  // Returns true if the the given scancode key is pressed/actived.
-  bool is_key_pressed(KeyScancode scancode);
-
-  // Returns the latest unicode character that activated the given
-  // scancode.
-  int get_unicode_from_scancode(KeyScancode scancode);
-
-  // Clears the keyboard buffer (used only in the Allegro port).
-  // TODO (deprecated)
-  void clear_keyboard_buffer();
-
 } // namespace she
 
 #endif
diff --git a/src/she/osx/system.h b/src/she/osx/system.h
new file mode 100644
index 000000000..5e7998f14
--- /dev/null
+++ b/src/she/osx/system.h
@@ -0,0 +1,31 @@
+// SHE library
+// Copyright (C) 2016  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef SHE_OSX_SYSTEM_H
+#define SHE_OSX_SYSTEM_H
+#pragma once
+
+#include "she/common/system.h"
+
+namespace she {
+
+bool osx_is_key_pressed(KeyScancode scancode);
+int osx_get_unicode_from_scancode(KeyScancode scancode);
+
+class OSXSystem : public CommonSystem {
+public:
+  bool isKeyPressed(KeyScancode scancode) override {
+    return osx_is_key_pressed(scancode);
+  }
+
+  int getUnicodeFromScancode(KeyScancode scancode) override {
+    return osx_get_unicode_from_scancode(scancode);
+  }
+};
+
+} // namespace she
+
+#endif
diff --git a/src/she/osx/view.mm b/src/she/osx/view.mm
index 8dd6d3e81..b28ae9ca1 100644
--- a/src/she/osx/view.mm
+++ b/src/she/osx/view.mm
@@ -16,6 +16,7 @@
 #include "she/keys.h"
 #include "she/osx/generate_drop_files.h"
 #include "she/osx/window.h"
+#include "she/system.h"
 
 #include <Carbon/Carbon.h>      // For VK codes
 
@@ -23,7 +24,7 @@ using namespace she;
 
 namespace {
 
-// Internal array of pressed keys used in is_key_pressed()
+// Internal array of pressed keys used in isKeyPressed()
 int g_pressedKeys[kKeyScancodes];
 bool g_translateDeadKeys = false;
 UInt32 g_lastDeadKeyState = 0;
@@ -73,7 +74,7 @@ KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
   if (nsFlags & NSControlKeyMask) modifiers |= kKeyCtrlModifier;
   if (nsFlags & NSAlternateKeyMask) modifiers |= kKeyAltModifier;
   if (nsFlags & NSCommandKeyMask) modifiers |= kKeyCmdModifier;
-  if (she::is_key_pressed(kKeySpace)) modifiers |= kKeySpaceModifier;
+  if (she::instance()->isKeyPressed(kKeySpace)) modifiers |= kKeySpaceModifier;
   return (KeyModifiers)modifiers;
 }
 
@@ -120,7 +121,7 @@ CFStringRef get_unicode_from_key_code(NSEvent* event,
 
 namespace she {
 
-bool is_key_pressed(KeyScancode scancode)
+bool osx_is_key_pressed(KeyScancode scancode)
 {
   if (scancode >= 0 && scancode < kKeyScancodes)
     return (g_pressedKeys[scancode] != 0);
@@ -128,7 +129,7 @@ bool is_key_pressed(KeyScancode scancode)
     return false;
 }
 
-int get_unicode_from_scancode(KeyScancode scancode)
+int osx_get_unicode_from_scancode(KeyScancode scancode)
 {
   if (scancode >= 0 && scancode < kKeyScancodes)
     return g_pressedKeys[scancode];
diff --git a/src/she/skia/she.cpp b/src/she/skia/she.cpp
index f95cc2c00..88b3e4ffc 100644
--- a/src/she/skia/she.cpp
+++ b/src/she/skia/she.cpp
@@ -34,11 +34,6 @@ void error_message(const char* msg)
   // TODO
 }
 
-void clear_keyboard_buffer()
-{
-  // Do nothing
-}
-
 } // namespace she
 
 extern int app_main(int argc, char* argv[]);
diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index 21a8e86d1..cb6e07fd5 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -21,7 +21,8 @@
 #elif __APPLE__
   #include "she/osx/app.h"
   #include "she/osx/event_queue.h"
-  #define SkiaSystemBase CommonSystem
+  #include "she/osx/system.h"
+  #define SkiaSystemBase OSXSystem
 #else
   #include "she/x11/event_queue.h"
   #define SkiaSystemBase CommonSystem
diff --git a/src/she/system.h b/src/she/system.h
index b1359627a..3bef4e756 100644
--- a/src/she/system.h
+++ b/src/she/system.h
@@ -10,6 +10,7 @@
 
 #include "gfx/fwd.h"
 #include "she/capabilities.h"
+#include "she/keys.h"
 
 #include <stdexcept>
 
@@ -50,10 +51,25 @@ namespace she {
     virtual Font* loadSpriteSheetFont(const char* filename, int scale = 1) = 0;
     virtual Font* loadTrueTypeFont(const char* filename, int height) = 0;
 
+    // Returns true if the the given scancode key is pressed/actived.
+    virtual bool isKeyPressed(KeyScancode scancode) = 0;
+
+    // Returns the active pressed modifiers.
+    virtual KeyModifiers keyModifiers() = 0;
+
+    // Returns the latest unicode character that activated the given
+    // scancode.
+    virtual int getUnicodeFromScancode(KeyScancode scancode) = 0;
+
+    // Clears the keyboard buffer (used only in the Allegro port).
+    // TODO (deprecated)
+    virtual void clearKeyboardBuffer() = 0;
+
     // Indicates if you want to use dead keys or not. By default it's
     // false, which behaves as regular shortcuts. You should set this
     // to true when you're inside a text field in your app.
     virtual void setTranslateDeadKeys(bool state) = 0;
+
   };
 
   System* create_system();
diff --git a/src/she/win/system.h b/src/she/win/system.h
index 48414127f..70e8a922c 100644
--- a/src/she/win/system.h
+++ b/src/she/win/system.h
@@ -13,6 +13,9 @@
 
 namespace she {
 
+bool win_is_key_pressed(KeyScancode scancode);
+int win_get_unicode_from_scancode(KeyScancode scancode);
+
 class WindowSystem : public CommonSystem {
 public:
   WindowSystem() { }
@@ -22,6 +25,14 @@ public:
     return m_penApi;
   }
 
+  bool isKeyPressed(KeyScancode scancode) override {
+    return win_is_key_pressed(scancode);
+  }
+
+  int getUnicodeFromScancode(KeyScancode scancode) override {
+    return win_get_unicode_from_scancode(scancode);
+  }
+
 private:
   PenAPI m_penApi;
 };
diff --git a/src/she/win/vk.cpp b/src/she/win/vk.cpp
index 6c56fb1f8..8cf6278db 100644
--- a/src/she/win/vk.cpp
+++ b/src/she/win/vk.cpp
@@ -335,9 +335,7 @@ static int scancode_to_win32vk(KeyScancode scancode)
   return keymap[scancode];
 }
 
-// TODO Move these functions to she::System class
-
-bool is_key_pressed(KeyScancode scancode)
+bool win_is_key_pressed(KeyScancode scancode)
 {
   int vk = scancode_to_win32vk(scancode);
   if (vk)
@@ -346,7 +344,7 @@ bool is_key_pressed(KeyScancode scancode)
     return false;
 }
 
-int get_unicode_from_scancode(KeyScancode scancode)
+int win_get_unicode_from_scancode(KeyScancode scancode)
 {
   int vk = scancode_to_win32vk(scancode);
   if (vk && (GetAsyncKeyState(vk) & 0x8000 ? true: false)) {
diff --git a/src/she/x11/keys.cpp b/src/she/x11/keys.cpp
index 303072fcc..717d79e7f 100644
--- a/src/she/x11/keys.cpp
+++ b/src/she/x11/keys.cpp
@@ -12,9 +12,14 @@
 
 namespace she {
 
-bool is_key_pressed(KeyScancode scancode)
+bool x11_is_key_pressed(KeyScancode scancode)
 {
   return false;                 // TODO
 }
 
+int x11_get_unicode_from_scancode(KeyScancode scancode)
+{
+  return 0;                     // TODO
+}
+
 } // namespace she
diff --git a/src/she/x11/system.h b/src/she/x11/system.h
new file mode 100644
index 000000000..bd1b4566f
--- /dev/null
+++ b/src/she/x11/system.h
@@ -0,0 +1,31 @@
+// SHE library
+// Copyright (C) 2016  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef SHE_X11_SYSTEM_H
+#define SHE_X11_SYSTEM_H
+#pragma once
+
+#include "she/common/system.h"
+
+namespace she {
+
+bool x11_is_key_pressed(KeyScancode scancode);
+int x11_get_unicode_from_scancode(KeyScancode scancode);
+
+class X11System : public CommonSystem {
+public:
+  bool isKeyPressed(KeyScancode scancode) override {
+    return x11_is_key_pressed(scancode);
+  }
+
+  int getUnicodeFromScancode(KeyScancode scancode) override {
+    return x11_get_unicode_from_scancode(scancode);
+  }
+};
+
+} // namespace she
+
+#endif
diff --git a/src/ui/accelerator.cpp b/src/ui/accelerator.cpp
index 6fb70b7d1..a40b5f685 100644
--- a/src/ui/accelerator.cpp
+++ b/src/ui/accelerator.cpp
@@ -15,6 +15,7 @@
 #include "base/split_string.h"
 #include "base/string.h"
 #include "base/unique_ptr.h"
+#include "she/system.h"
 
 #include <cctype>
 #include <cstdlib>
@@ -141,20 +142,6 @@ const char* scancode_to_string[] = { // Same order that she::KeyScancode
 int scancode_to_string_size =
   sizeof(scancode_to_string) / sizeof(scancode_to_string[0]);
 
-KeyModifiers get_pressed_modifiers_from_she()
-{
-  KeyModifiers mods = kKeyNoneModifier;
-  if (she::is_key_pressed(kKeyLShift)  ) mods = KeyModifiers(int(mods) | int(kKeyShiftModifier));
-  if (she::is_key_pressed(kKeyRShift)  ) mods = KeyModifiers(int(mods) | int(kKeyShiftModifier));
-  if (she::is_key_pressed(kKeyLControl)) mods = KeyModifiers(int(mods) | int(kKeyCtrlModifier));
-  if (she::is_key_pressed(kKeyRControl)) mods = KeyModifiers(int(mods) | int(kKeyCtrlModifier));
-  if (she::is_key_pressed(kKeyAlt)     ) mods = KeyModifiers(int(mods) | int(kKeyAltModifier));
-  if (she::is_key_pressed(kKeyCommand) ) mods = KeyModifiers(int(mods) | int(kKeyCmdModifier));
-  if (she::is_key_pressed(kKeyLWin)    ) mods = KeyModifiers(int(mods) | int(kKeyWinModifier));
-  if (she::is_key_pressed(kKeyRWin)    ) mods = KeyModifiers(int(mods) | int(kKeyWinModifier));
-  return mods;
-}
-
 } // anonymous namespace
 
 Accelerator::Accelerator()
@@ -349,7 +336,8 @@ bool Accelerator::isPressed(KeyModifiers modifiers, KeyScancode scancode, int un
 
 bool Accelerator::isPressed() const
 {
-  KeyModifiers pressedModifiers = get_pressed_modifiers_from_she();
+  she::System* sys = she::instance();
+  KeyModifiers pressedModifiers = sys->keyModifiers();
 
   // Check if this shortcut is only
   if (m_scancode == kKeyNil && m_unicodeChar == 0)
@@ -357,10 +345,10 @@ bool Accelerator::isPressed() const
 
   // Compare with all pressed scancodes
   for (int s=int(kKeyNil); s<int(kKeyFirstModifierScancode); ++s) {
-    if (she::is_key_pressed(KeyScancode(s)) &&
+    if (sys->isKeyPressed(KeyScancode(s)) &&
         isPressed(pressedModifiers,
                   KeyScancode(s),
-                  she::get_unicode_from_scancode(KeyScancode(s))))
+                  sys->getUnicodeFromScancode(KeyScancode(s))))
       return true;
   }
 
@@ -369,7 +357,8 @@ bool Accelerator::isPressed() const
 
 bool Accelerator::isLooselyPressed() const
 {
-  KeyModifiers pressedModifiers = get_pressed_modifiers_from_she();
+  she::System* sys = she::instance();
+  KeyModifiers pressedModifiers = sys->keyModifiers();
 
   if ((m_modifiers & pressedModifiers) != m_modifiers)
     return false;
@@ -380,10 +369,10 @@ bool Accelerator::isLooselyPressed() const
 
   // Compare with all pressed scancodes
   for (int s=int(kKeyNil); s<int(kKeyFirstModifierScancode); ++s) {
-    if (she::is_key_pressed(KeyScancode(s)) &&
+    if (sys->isKeyPressed(KeyScancode(s)) &&
         isPressed(m_modifiers,  // Use same modifiers (we've already compared the modifiers)
                   KeyScancode(s),
-                  she::get_unicode_from_scancode(KeyScancode(s))))
+                  sys->getUnicodeFromScancode(KeyScancode(s))))
       return true;
   }
 
diff --git a/src/ui/message.cpp b/src/ui/message.cpp
index 6134ba850..3e4c9e394 100644
--- a/src/ui/message.cpp
+++ b/src/ui/message.cpp
@@ -23,21 +23,10 @@ Message::Message(MessageType type, KeyModifiers modifiers)
   : m_type(type)
   , m_used(false)
 {
-  if (modifiers == kKeyUninitializedModifier) {
-    // Get modifiers from the deprecated API
-    // TODO remove this
-    m_modifiers = (KeyModifiers)
-      ((she::is_key_pressed(kKeyLShift) || she::is_key_pressed(kKeyRShift) ? kKeyShiftModifier: 0) |
-       (she::is_key_pressed(kKeyLControl) || she::is_key_pressed(kKeyRControl) ? kKeyCtrlModifier: 0) |
-       (she::is_key_pressed(kKeyAlt) ? kKeyAltModifier: 0) |
-       (she::is_key_pressed(kKeyAltGr) ? (kKeyCtrlModifier | kKeyAltModifier): 0) |
-       (she::is_key_pressed(kKeyCommand) ? kKeyCmdModifier: 0) |
-       (she::is_key_pressed(kKeySpace) ? kKeySpaceModifier: 0) |
-       (she::is_key_pressed(kKeyLWin) || she::is_key_pressed(kKeyRWin) ? kKeyWinModifier: 0));
-  }
-  else {
+  if (modifiers == kKeyUninitializedModifier)
+    m_modifiers = she::instance()->keyModifiers();
+  else
     m_modifiers = modifiers;
-  }
 }
 
 Message::~Message()

From 02b9a953ef57690d0ab1122417d605f5e5c36609 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 12:13:10 -0300
Subject: [PATCH 35/77] Avoid creating a System instance in she::instance()

This is necessary for tests that don't need a System but call the
instance() function anyway.
---
 src/main/main.cpp      |  2 +-
 src/she/alleg4/she.cpp |  2 +-
 src/she/osx/view.mm    | 10 ++++++----
 src/she/skia/she.cpp   |  2 +-
 src/she/system.cpp     | 15 +++++++++++----
 src/tests/test.h       |  2 +-
 src/ui/accelerator.cpp |  6 ++++++
 7 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 69943d811..d2f99f467 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -66,7 +66,7 @@ int app_main(int argc, char* argv[])
     MemLeak memleak;
     base::SystemConsole systemConsole;
     app::AppOptions options(argc, const_cast<const char**>(argv));
-    she::ScopedHandle<she::System> system(she::instance());
+    she::ScopedHandle<she::System> system(she::create_system());
     app::App app;
 
     // Change the name of the memory dump file
diff --git a/src/she/alleg4/she.cpp b/src/she/alleg4/she.cpp
index 4c08f2d72..bd685f006 100644
--- a/src/she/alleg4/she.cpp
+++ b/src/she/alleg4/she.cpp
@@ -233,7 +233,7 @@ public:
 
 };
 
-System* create_system() {
+System* create_system_impl() {
   return new Alleg4System();
 }
 
diff --git a/src/she/osx/view.mm b/src/she/osx/view.mm
index b28ae9ca1..f6589b0f3 100644
--- a/src/she/osx/view.mm
+++ b/src/she/osx/view.mm
@@ -20,7 +20,9 @@
 
 #include <Carbon/Carbon.h>      // For VK codes
 
-using namespace she;
+namespace she {
+
+bool osx_is_key_pressed(KeyScancode scancode);
 
 namespace {
 
@@ -74,7 +76,7 @@ KeyModifiers get_modifiers_from_nsevent(NSEvent* event)
   if (nsFlags & NSControlKeyMask) modifiers |= kKeyCtrlModifier;
   if (nsFlags & NSAlternateKeyMask) modifiers |= kKeyAltModifier;
   if (nsFlags & NSCommandKeyMask) modifiers |= kKeyCmdModifier;
-  if (she::instance()->isKeyPressed(kKeySpace)) modifiers |= kKeySpaceModifier;
+  if (osx_is_key_pressed(kKeySpace)) modifiers |= kKeySpaceModifier;
   return (KeyModifiers)modifiers;
 }
 
@@ -119,8 +121,6 @@ CFStringRef get_unicode_from_key_code(NSEvent* event,
 
 } // anonymous namespace
 
-namespace she {
-
 bool osx_is_key_pressed(KeyScancode scancode)
 {
   if (scancode >= 0 && scancode < kKeyScancodes)
@@ -139,6 +139,8 @@ int osx_get_unicode_from_scancode(KeyScancode scancode)
 
 } // namespace she
 
+using namespace she;
+
 @implementation OSXView
 
 - (id)initWithFrame:(NSRect)frameRect
diff --git a/src/she/skia/she.cpp b/src/she/skia/she.cpp
index 88b3e4ffc..37c5e91e0 100644
--- a/src/she/skia/she.cpp
+++ b/src/she/skia/she.cpp
@@ -24,7 +24,7 @@
 
 namespace she {
 
-System* create_system() {
+System* create_system_impl() {
   return new SkiaSystem();
 }
 
diff --git a/src/she/system.cpp b/src/she/system.cpp
index 2b746792b..acc7ccf85 100644
--- a/src/she/system.cpp
+++ b/src/she/system.cpp
@@ -12,12 +12,19 @@
 
 namespace she {
 
+static System* g_system = nullptr;
+
+System* create_system_impl();   // Defined on each back-end
+
+System* create_system()
+{
+  ASSERT(!g_system);
+  return g_system = create_system_impl();
+}
+
 System* instance()
 {
-  static System* sys = nullptr;
-  if (!sys)
-    sys = create_system();
-  return sys;
+  return g_system;
 }
 
 } // namespace she
diff --git a/src/tests/test.h b/src/tests/test.h
index 9896066e8..9238ab4d1 100644
--- a/src/tests/test.h
+++ b/src/tests/test.h
@@ -38,7 +38,7 @@ int main(int argc, char* argv[])
   #ifdef TEST_GUI
     {
       // Do not create a she::System, as we don't need it for testing purposes.
-      //she::ScopedHandle<she::System> system(she::instance());
+      //she::ScopedHandle<she::System> system(she::create_system());
       ui::UISystem uiSystem;
       ui::Manager uiManager;
   #endif
diff --git a/src/ui/accelerator.cpp b/src/ui/accelerator.cpp
index a40b5f685..732f6e639 100644
--- a/src/ui/accelerator.cpp
+++ b/src/ui/accelerator.cpp
@@ -337,6 +337,9 @@ bool Accelerator::isPressed(KeyModifiers modifiers, KeyScancode scancode, int un
 bool Accelerator::isPressed() const
 {
   she::System* sys = she::instance();
+  if (!sys)
+    return false;
+
   KeyModifiers pressedModifiers = sys->keyModifiers();
 
   // Check if this shortcut is only
@@ -358,6 +361,9 @@ bool Accelerator::isPressed() const
 bool Accelerator::isLooselyPressed() const
 {
   she::System* sys = she::instance();
+  if (!sys)
+    return false;
+
   KeyModifiers pressedModifiers = sys->keyModifiers();
 
   if ((m_modifiers & pressedModifiers) != m_modifiers)

From 31de049a68439928eb276fbe23ecec1bd0886496 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 12:26:43 -0300
Subject: [PATCH 36/77] Add missing #include to use ASSERT()

---
 src/she/system.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/she/system.cpp b/src/she/system.cpp
index acc7ccf85..8155fb949 100644
--- a/src/she/system.cpp
+++ b/src/she/system.cpp
@@ -8,6 +8,7 @@
 #include "config.h"
 #endif
 
+#include "base/debug.h"
 #include "she/system.h"
 
 namespace she {

From 6746049e60ec1c1a00ea5dea163017b669cad3a7 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 13:47:02 -0300
Subject: [PATCH 37/77] Fix 1...6 keys to go to a specific frame on Windows

These keys where captured by the zoom command (gui Manager) first.
This regression was introduced in 00099390daf9d24cae6910e3c67d43e15b7cc542
---
 src/ui/entry.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index 24d59c70f..7f8f394ea 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -329,9 +329,8 @@ bool Entry::onProcessMessage(Message* msg)
             if (keymsg->isDeadKey()) {
               selectText(m_caret-1, m_caret);
             }
-            return true;
           }
-          break;
+          return true;
         }
 
         executeCmd(cmd, keymsg->unicodeChar(),

From 0703bf159ce224ed64812bef6ca2e3bcfde5407d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 14:22:14 -0300
Subject: [PATCH 38/77] Add ui::Manager::processFocusMovementMessage() function

---
 src/ui/manager.cpp | 11 +++++------
 src/ui/manager.h   |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index de23ce344..44df35bc5 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -75,7 +75,6 @@ static Widget* capture_widget;  // The widget that captures the mouse
 static bool first_time = true;    // true when we don't enter in poll yet
 
 /* keyboard focus movement stuff */
-static bool move_focus(Manager* manager, Message* msg);
 static int count_widgets_accept_focus(Widget* widget);
 static bool childs_accept_focus(Widget* widget, bool first);
 static Widget* next_widget(Widget* widget);
@@ -1113,7 +1112,7 @@ bool Manager::onProcessMessage(Message* msg)
       // Check the focus movement for foreground (non-desktop) windows.
       if (win && win->isForeground()) {
         if (msg->type() == kKeyDownMessage)
-          move_focus(this, msg);
+          processFocusMovementMessage(msg);
         return true;
       }
       else
@@ -1512,7 +1511,7 @@ void Manager::broadcastKeyMsg(Message* msg)
                             Focus Movement
  ***********************************************************************/
 
-static bool move_focus(Manager* manager, Message* msg)
+bool Manager::processFocusMovementMessage(Message* msg)
 {
   int (*cmp)(Widget*, int, int) = NULL;
   Widget* focus = NULL;
@@ -1525,8 +1524,8 @@ static bool move_focus(Manager* manager, Message* msg)
   if (focus_widget) {
     window = focus_widget->window();
   }
-  else if (!manager->children().empty()) {
-    window = manager->getTopWindow();
+  else if (!this->children().empty()) {
+    window = this->getTopWindow();
   }
 
   if (!window)
@@ -1612,7 +1611,7 @@ static bool move_focus(Manager* manager, Message* msg)
     }
 
     if ((focus) && (focus != focus_widget))
-      Manager::getDefault()->setFocus(focus);
+      setFocus(focus);
   }
 
   return ret;
diff --git a/src/ui/manager.h b/src/ui/manager.h
index 520a3a8de..14f061531 100644
--- a/src/ui/manager.h
+++ b/src/ui/manager.h
@@ -84,6 +84,7 @@ namespace ui {
     LayoutIO* getLayoutIO();
 
     bool isFocusMovementKey(Message* msg);
+    bool processFocusMovementMessage(Message* msg);
 
     // Returns the invalid region in the screen to being updated with
     // PaintMessages. This region is cleared when each widget receives

From d8bc90696e5e00420c154e3084965efdd85ad9f8 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 18 Nov 2016 14:26:00 -0300
Subject: [PATCH 39/77] Rename Manager::isFocusMovementKey ->
 isFocusMovementMessage

---
 src/ui/entry.cpp   | 2 +-
 src/ui/manager.cpp | 7 +++++--
 src/ui/manager.h   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index 7f8f394ea..9b2b4d76a 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -314,7 +314,7 @@ bool Entry::onProcessMessage(Message* msg)
                 case kKeyA: cmd = EntryCmd::SelectAll; break;
               }
             }
-            else if (manager()->isFocusMovementKey(msg)) {
+            else if (manager()->isFocusMovementMessage(msg)) {
               return Widget::onProcessMessage(msg);
             }
             break;
diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 44df35bc5..314239dd7 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -970,10 +970,13 @@ void Manager::removeMessageFilterFor(Widget* widget)
   }
 }
 
-bool Manager::isFocusMovementKey(Message* msg)
+bool Manager::isFocusMovementMessage(Message* msg)
 {
-  switch (static_cast<KeyMessage*>(msg)->scancode()) {
+  if (msg->type() != kKeyDownMessage &&
+      msg->type() != kKeyUpMessage)
+    return false;
 
+  switch (static_cast<KeyMessage*>(msg)->scancode()) {
     case kKeyTab:
     case kKeyLeft:
     case kKeyRight:
diff --git a/src/ui/manager.h b/src/ui/manager.h
index 14f061531..e9bf61986 100644
--- a/src/ui/manager.h
+++ b/src/ui/manager.h
@@ -83,7 +83,7 @@ namespace ui {
 
     LayoutIO* getLayoutIO();
 
-    bool isFocusMovementKey(Message* msg);
+    bool isFocusMovementMessage(Message* msg);
     bool processFocusMovementMessage(Message* msg);
 
     // Returns the invalid region in the screen to being updated with

From f054aaa2cc6336388514425b5dc9f0fcc013ce79 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 19 Nov 2016 00:23:54 -0300
Subject: [PATCH 40/77] Minor changes in ui::Slider

---
 src/ui/slider.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp
index 779bc5d8d..00af4c441 100644
--- a/src/ui/slider.cpp
+++ b/src/ui/slider.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -35,7 +35,7 @@ Slider::Slider(int min, int max, int value, SliderDelegate* delegate)
   , m_readOnly(false)
   , m_delegate(delegate)
 {
-  this->setFocusStop(true);
+  setFocusStop(true);
   initTheme();
 }
 
@@ -136,7 +136,6 @@ bool Slider::onProcessMessage(Message* msg)
         }
 
         value = MID(m_min, value, m_max);
-
         if (m_value != value) {
           setValue(value);
           onChange();
@@ -165,21 +164,20 @@ bool Slider::onProcessMessage(Message* msg)
 
     case kKeyDownMessage:
       if (hasFocus() && !isReadOnly()) {
-        int min = m_min;
-        int max = m_max;
         int value = m_value;
 
         switch (static_cast<KeyMessage*>(msg)->scancode()) {
-          case kKeyLeft:     value = MAX(value-1, min); break;
-          case kKeyRight:    value = MIN(value+1, max); break;
-          case kKeyPageDown: value = MAX(value-(max-min+1)/4, min); break;
-          case kKeyPageUp:   value = MIN(value+(max-min+1)/4, max); break;
-          case kKeyHome:     value = min; break;
-          case kKeyEnd:      value = max; break;
+          case kKeyLeft:     --value; break;
+          case kKeyRight:    ++value; break;
+          case kKeyPageDown: value -= (m_max-m_min+1)/4; break;
+          case kKeyPageUp:   value += (m_max-m_min+1)/4; break;
+          case kKeyHome:     value = m_min; break;
+          case kKeyEnd:      value = m_max; break;
           default:
             goto not_used;
         }
 
+        value = MID(m_min, value, m_max);
         if (m_value != value) {
           setValue(value);
           onChange();

From 3f1f07807bba6bd3f9f8f43de0380f1b49a3d1ca Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 19 Nov 2016 00:57:58 -0300
Subject: [PATCH 41/77] Add support to cycle RGB/HSV text fields with tab key
 (fix #1019)

Added a new flag in messages to know if they came from a filter or from
the original chain of recipients. To do this, we've added a new way to
process message filters: instead of pre-adding filters to the list of
message recipients, we process filters in the Manager::pumpQueue()
member function itself. (So the list of "recipients" is not modified.)
---
 src/ui/manager.cpp      | 333 +++++++++++++++++++++-------------------
 src/ui/manager.h        |  10 +-
 src/ui/message.cpp      |   1 +
 src/ui/message.h        |   5 +-
 src/ui/popup_window.cpp |   7 +
 5 files changed, 196 insertions(+), 160 deletions(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 314239dd7..fdb8d8226 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -47,8 +47,7 @@ namespace ui {
 
 static const int NFILTERS = (int)(kFirstRegisteredMessage+1);
 
-struct Filter
-{
+struct Filter {
   int message;
   Widget* widget;
 
@@ -67,6 +66,7 @@ static WidgetsList new_windows; // Windows that we should show
 static WidgetsList mouse_widgets_list; // List of widgets to send mouse events
 static Messages msg_queue;             // Messages queue
 static Filters msg_filters[NFILTERS]; // Filters for every enqueued message
+static int filter_locks = 0;
 
 static Widget* focus_widget;    // The widget with the focus
 static Widget* mouse_widget;    // The widget with the mouse
@@ -83,6 +83,37 @@ static int cmp_right(Widget* widget, int x, int y);
 static int cmp_up(Widget* widget, int x, int y);
 static int cmp_down(Widget* widget, int x, int y);
 
+namespace {
+
+class LockFilters {
+public:
+  LockFilters() {
+    ++filter_locks;
+  }
+  ~LockFilters() {
+    ASSERT(filter_locks > 0);
+    --filter_locks;
+
+    if (filter_locks == 0) {
+      // Clear empty filters
+      for (Filters& msg_filter : msg_filters) {
+        for (auto it = msg_filter.begin(); it != msg_filter.end(); ) {
+          Filter* filter = *it;
+          if (filter->widget == nullptr) {
+            delete filter;
+            it = msg_filter.erase(it);
+          }
+          else {
+            ++it;
+          }
+        }
+      }
+    }
+  }
+};
+
+} // anonymous namespace
+
 Manager::Manager()
   : Widget(kManagerWidget)
   , m_display(NULL)
@@ -127,15 +158,13 @@ Manager::~Manager()
     Timer::checkNoTimers();
 
     // Destroy filters
-    for (int c=0; c<NFILTERS; ++c) {
-      for (Filters::iterator it=msg_filters[c].begin(), end=msg_filters[c].end();
-           it != end; ++it)
-        delete *it;
-      msg_filters[c].clear();
-    }
+#ifdef _DEBUG
+    for (Filters& msg_filter : msg_filters)
+      ASSERT(msg_filter.empty());
+#endif
 
     // No more default manager
-    m_defaultManager = NULL;
+    m_defaultManager = nullptr;
 
     // Shutdown system
     ASSERT(msg_queue.empty());
@@ -592,48 +621,10 @@ void Manager::addToGarbage(Widget* widget)
   m_garbage.push_back(widget);
 }
 
-/**
- * @param msg You can't use the this message after calling this
- *            routine. The message will be automatically freed through
- *            @ref jmessage_free
- */
 void Manager::enqueueMessage(Message* msg)
 {
-  ASSERT(msg != NULL);
-
-#ifdef REPORT_EVENTS
-  if (msg->type() == kKeyDownMessage ||
-      msg->type() == kKeyUpMessage) {
-    int mods = (int)static_cast<KeyMessage*>(msg)->modifiers();
-    TRACE("Key%s scancode=%d unicode=%d mods=%s%s%s\n",
-          (msg->type() == kKeyDownMessage ? "Down": "Up"),
-          static_cast<KeyMessage*>(msg)->scancode(),
-          static_cast<KeyMessage*>(msg)->unicodeChar(),
-          mods & kKeyShiftModifier ? " Shift": "",
-          mods & kKeyCtrlModifier ? " Ctrl": "",
-          mods & kKeyAltModifier ? " Alt": "");
-  }
-#endif
-
-  // Check if this message must be filtered by some widget before
-  int c = msg->type();
-  if (c >= kFirstRegisteredMessage)
-    c = kFirstRegisteredMessage;
-
-  if (!msg_filters[c].empty()) { // OK, so are filters to add...
-    // Add all the filters in the destination list of the message
-    for (Filters::reverse_iterator it=msg_filters[c].rbegin(),
-           end=msg_filters[c].rend(); it != end; ++it) {
-      Filter* filter = *it;
-      if (msg->type() == filter->message)
-        msg->prependRecipient(filter->widget);
-    }
-  }
-
-  if (msg->hasRecipients())
-    msg_queue.push_back(msg);
-  else
-    delete msg;
+  ASSERT(msg);
+  msg_queue.push_back(msg);
 }
 
 Window* Manager::getTopWindow()
@@ -931,6 +922,7 @@ void Manager::removeMessagesForTimer(Timer* timer)
 
 void Manager::addMessageFilter(int message, Widget* widget)
 {
+  LockFilters lock;
   int c = message;
   if (c >= kFirstRegisteredMessage)
     c = kFirstRegisteredMessage;
@@ -940,32 +932,25 @@ void Manager::addMessageFilter(int message, Widget* widget)
 
 void Manager::removeMessageFilter(int message, Widget* widget)
 {
+  LockFilters lock;
   int c = message;
   if (c >= kFirstRegisteredMessage)
     c = kFirstRegisteredMessage;
 
-  for (Filters::iterator it=msg_filters[c].begin(); it != msg_filters[c].end(); ) {
-    Filter* filter = *it;
-    if (filter->widget == widget) {
-      delete filter;
-      it = msg_filters[c].erase(it);
-    }
-    else
-      ++it;
+  Filters& msg_filter = msg_filters[c];
+  for (Filter* filter : msg_filter) {
+    if (filter->widget == widget)
+      filter->widget = nullptr;
   }
 }
 
 void Manager::removeMessageFilterFor(Widget* widget)
 {
-  for (int c=0; c<NFILTERS; ++c) {
-    for (Filters::iterator it=msg_filters[c].begin(); it != msg_filters[c].end(); ) {
-      Filter* filter = *it;
-      if (filter->widget == widget) {
-        delete filter;
-        it = msg_filters[c].erase(it);
-      }
-      else
-        ++it;
+  LockFilters lock;
+  for (Filters& msg_filter : msg_filters) {
+    for (Filter* filter : msg_filter) {
+      if (filter->widget == widget)
+        filter->widget = nullptr;
     }
   }
 }
@@ -1235,7 +1220,7 @@ void Manager::pumpQueue()
   base::tick_t t = base::current_tick();
 #endif
 
-  Messages::iterator it = msg_queue.begin();
+  auto it = msg_queue.begin();
   while (it != msg_queue.end()) {
 #ifdef LIMIT_DISPATCH_TIME
     if (base::current_tick()-t > 250)
@@ -1262,102 +1247,36 @@ void Manager::pumpQueue()
     }
 
     bool done = false;
-    for (auto widget : msg->recipients()) {
-      if (!widget)
-        continue;
 
-#ifdef REPORT_EVENTS
-      {
-        static const char* msg_name[] = {
-          "kOpenMessage",
-          "kCloseMessage",
-          "kCloseDisplayMessage",
-          "kResizeDisplayMessage",
-          "kPaintMessage",
-          "kTimerMessage",
-          "kDropFilesMessage",
-          "kWinMoveMessage",
+    // Send this message to filters
+    {
+      Filters& msg_filter = msg_filters[MIN(msg->type(), kFirstRegisteredMessage)];
+      if (!msg_filter.empty()) {
+        LockFilters lock;
+        for (Filter* filter : msg_filter) {
+          // The widget can be nullptr in case that the filter was
+          // "pre-removed" (it'll finally erased from the
+          // msg_filter list from ~LockFilters()).
+          if (filter->widget != nullptr &&
+              msg->type() == filter->message) {
+            msg->setFromFilter(true);
+            done = sendMessageToWidget(msg, filter->widget);
+            msg->setFromFilter(false);
 
-          "kKeyDownMessage",
-          "kKeyUpMessage",
-          "kFocusEnterMessage",
-          "kFocusLeaveMessage",
-
-          "kMouseDownMessage",
-          "kMouseUpMessage",
-          "kDoubleClickMessage",
-          "kMouseEnterMessage",
-          "kMouseLeaveMessage",
-          "kMouseMoveMessage",
-          "kSetCursorMessage",
-          "kMouseWheelMessage",
-          "kTouchMagnifyMessage",
-        };
-        const char* string =
-          (msg->type() >= kOpenMessage &&
-           msg->type() <= kMouseWheelMessage) ? msg_name[msg->type()]:
-                                                "Unknown";
-
-        std::cout << "Event " << msg->type() << " (" << string << ") "
-                  << "for " << typeid(*widget).name();
-        if (!widget->id().empty())
-          std::cout << " (" << widget->id() << ")";
-        std::cout << std::endl;
-      }
-#endif
-
-      // We need to configure the clip region for paint messages
-      // before we call Widget::sendMessage().
-      if (msg->type() == kPaintMessage) {
-        if (widget->hasFlags(HIDDEN))
-          continue;
-
-        PaintMessage* paintMsg = static_cast<PaintMessage*>(msg);
-        she::Surface* surface = m_display->getSurface();
-        gfx::Rect oldClip = surface->getClipBounds();
-
-        if (surface->intersectClipRect(paintMsg->rect())) {
-#ifdef REPORT_EVENTS
-          std::cout << " - clip("
-                    << paintMsg->rect().x << ", "
-                    << paintMsg->rect().y << ", "
-                    << paintMsg->rect().w << ", "
-                    << paintMsg->rect().h << ")"
-                    << std::endl;
-#endif
-
-#ifdef DEBUG_PAINT_EVENTS
-          {
-            she::SurfaceLock lock(surface);
-            surface->fillRect(gfx::rgba(0, 0, 255), paintMsg->rect());
-          }
-
-          if (m_display)
-            m_display->flip(gfx::Rect(0, 0, display_w(), display_h()));
-
-          base::this_thread::sleep_for(0.002);
-#endif
-
-          if (surface) {
-            // Call the message handler
-            done = widget->sendMessage(msg);
-
-            // Restore clip region for paint messages.
-            surface->setClipBounds(oldClip);
+            if (done)
+              break;
           }
         }
-
-        // As this kPaintMessage's rectangle was updated, we can
-        // remove it from "m_invalidRegion".
-        m_invalidRegion -= gfx::Region(paintMsg->rect());
-      }
-      else {
-        // Call the message handler
-        done = widget->sendMessage(msg);
       }
+    }
 
-      if (done)
-        break;
+    if (!done) {
+      // Then send the message to its recipients
+      for (Widget* widget : msg->recipients()) {
+        done = sendMessageToWidget(msg, widget);
+        if (done)
+          break;
+      }
     }
 
     // Remove the message from the msg_queue
@@ -1368,6 +1287,106 @@ void Manager::pumpQueue()
   }
 }
 
+bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
+{
+  if (!widget)
+    return false;
+
+#ifdef REPORT_EVENTS
+  {
+    static const char* msg_name[] = {
+      "kOpenMessage",
+      "kCloseMessage",
+      "kCloseDisplayMessage",
+      "kResizeDisplayMessage",
+      "kPaintMessage",
+      "kTimerMessage",
+      "kDropFilesMessage",
+      "kWinMoveMessage",
+
+      "kKeyDownMessage",
+      "kKeyUpMessage",
+      "kFocusEnterMessage",
+      "kFocusLeaveMessage",
+
+      "kMouseDownMessage",
+      "kMouseUpMessage",
+      "kDoubleClickMessage",
+      "kMouseEnterMessage",
+      "kMouseLeaveMessage",
+      "kMouseMoveMessage",
+      "kSetCursorMessage",
+      "kMouseWheelMessage",
+      "kTouchMagnifyMessage",
+    };
+    const char* string =
+      (msg->type() >= kOpenMessage &&
+       msg->type() <= kMouseWheelMessage) ? msg_name[msg->type()]:
+                                            "Unknown";
+
+    std::cout << "Event " << msg->type() << " (" << string << ") "
+              << "for " << typeid(*widget).name();
+    if (!widget->id().empty())
+      std::cout << " (" << widget->id() << ")";
+    std::cout << std::endl;
+  }
+#endif
+
+  bool used = false;
+
+  // We need to configure the clip region for paint messages
+  // before we call Widget::sendMessage().
+  if (msg->type() == kPaintMessage) {
+    if (widget->hasFlags(HIDDEN))
+      return false;
+
+    PaintMessage* paintMsg = static_cast<PaintMessage*>(msg);
+    she::Surface* surface = m_display->getSurface();
+    gfx::Rect oldClip = surface->getClipBounds();
+
+    if (surface->intersectClipRect(paintMsg->rect())) {
+#ifdef REPORT_EVENTS
+      std::cout << " - clip("
+                << paintMsg->rect().x << ", "
+                << paintMsg->rect().y << ", "
+                << paintMsg->rect().w << ", "
+                << paintMsg->rect().h << ")"
+                << std::endl;
+#endif
+
+#ifdef DEBUG_PAINT_EVENTS
+      {
+        she::SurfaceLock lock(surface);
+        surface->fillRect(gfx::rgba(0, 0, 255), paintMsg->rect());
+      }
+
+      if (m_display)
+        m_display->flip(gfx::Rect(0, 0, display_w(), display_h()));
+
+      base::this_thread::sleep_for(0.002);
+#endif
+
+      if (surface) {
+        // Call the message handler
+        used = widget->sendMessage(msg);
+
+        // Restore clip region for paint messages.
+        surface->setClipBounds(oldClip);
+      }
+    }
+
+    // As this kPaintMessage's rectangle was updated, we can
+    // remove it from "m_invalidRegion".
+    m_invalidRegion -= gfx::Region(paintMsg->rect());
+  }
+  else {
+    // Call the message handler
+    used = widget->sendMessage(msg);
+  }
+
+  return used;
+}
+
 void Manager::invalidateDisplayRegion(const gfx::Region& region)
 {
   // TODO intersect with getDrawableRegion()???
diff --git a/src/ui/manager.h b/src/ui/manager.h
index e9bf61986..6193e696a 100644
--- a/src/ui/manager.h
+++ b/src/ui/manager.h
@@ -45,11 +45,15 @@ namespace ui {
     // Refreshes the real display with the UI content.
     void flipDisplay();
 
+    // Adds the given "msg" message to the queue of messages to be
+    // dispached. "msg" cannot be used after this function, it'll be
+    // automatically deleted.
+    void enqueueMessage(Message* msg);
+
     // Returns true if there are messages in the queue to be
-    // distpatched through jmanager_dispatch_messages().
+    // dispatched through dispatchMessages().
     bool generateMessages();
     void dispatchMessages();
-    void enqueueMessage(Message* msg);
 
     void addToGarbage(Widget* widget);
     void collectGarbage();
@@ -146,6 +150,8 @@ namespace ui {
     void handleWindowZOrder();
 
     void pumpQueue();
+    bool sendMessageToWidget(Message* msg, Widget* widget);
+
     static void removeWidgetFromRecipients(Widget* widget, Message* msg);
     static bool someParentIsFocusStop(Widget* widget);
     static Widget* findMagneticWidget(Widget* widget);
diff --git a/src/ui/message.cpp b/src/ui/message.cpp
index 3e4c9e394..bd5776a6c 100644
--- a/src/ui/message.cpp
+++ b/src/ui/message.cpp
@@ -22,6 +22,7 @@ namespace ui {
 Message::Message(MessageType type, KeyModifiers modifiers)
   : m_type(type)
   , m_used(false)
+  , m_fromFilter(false)
 {
   if (modifiers == kKeyUninitializedModifier)
     m_modifiers = she::instance()->keyModifiers();
diff --git a/src/ui/message.h b/src/ui/message.h
index d78f75166..c2ee8eab6 100644
--- a/src/ui/message.h
+++ b/src/ui/message.h
@@ -37,6 +37,8 @@ namespace ui {
     const WidgetsList& recipients() const { return m_recipients; }
     bool hasRecipients() const { return !m_recipients.empty(); }
     bool isUsed() const { return m_used; }
+    bool fromFilter() const { return m_fromFilter; }
+    void setFromFilter(bool state) { m_fromFilter = state; }
     void markAsUsed() { m_used = true; }
     KeyModifiers modifiers() const { return m_modifiers; }
     bool shiftPressed() const { return (m_modifiers & kKeyShiftModifier) == kKeyShiftModifier; }
@@ -57,9 +59,10 @@ namespace ui {
     void broadcastToChildren(Widget* widget);
 
   private:
-    MessageType m_type;         // Type of message
+    MessageType m_type;       // Type of message
     WidgetsList m_recipients; // List of recipients of the message
     bool m_used;              // Was used
+    bool m_fromFilter;        // Sent from pre-filter
     KeyModifiers m_modifiers; // Key modifiers pressed when message was created
   };
 
diff --git a/src/ui/popup_window.cpp b/src/ui/popup_window.cpp
index a49791a86..96bd55a93 100644
--- a/src/ui/popup_window.cpp
+++ b/src/ui/popup_window.cpp
@@ -116,6 +116,13 @@ bool PopupWindow::onProcessMessage(Message* msg)
           closeWindow(this);
           return true;
         }
+
+        // If the message came from a filter, we don't send it back to
+        // the default Window processing (which will send the message
+        // to the Manager). In this way, the focused children can
+        // process the kKeyDownMessage.
+        if (msg->fromFilter())
+          return false;
       }
       break;
 

From 0b076025732ef5ca74d6f49e090a7765e805d764 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 19 Nov 2016 01:14:40 -0300
Subject: [PATCH 42/77] Avoid reaching our CustomizedGuiManager when Tab is
 pressed (fix #1019)

---
 src/app/ui/color_sliders.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp
index 08adfaf44..53fd0576a 100644
--- a/src/app/ui/color_sliders.cpp
+++ b/src/app/ui/color_sliders.cpp
@@ -17,6 +17,7 @@
 #include "ui/entry.h"
 #include "ui/graphics.h"
 #include "ui/label.h"
+#include "ui/message.h"
 #include "ui/size_hint_event.h"
 #include "ui/slider.h"
 #include "ui/theme.h"
@@ -81,6 +82,30 @@ namespace {
     app::Color m_color;
   };
 
+  class ColorEntry : public Entry {
+  public:
+    ColorEntry() : Entry(4, "0") {
+    }
+
+    bool onProcessMessage(Message* msg) override {
+      switch (msg->type()) {
+
+        case kKeyDownMessage:
+          if (Entry::onProcessMessage(msg))
+            return true;
+          // Process focus movement key here because if our
+          // CustomizedGuiManager catches this kKeyDownMessage it will
+          // process it as a shortcut to switch the Timeline.
+          else if (manager()->processFocusMovementMessage(msg))
+            return true;
+          else
+            return false;
+      }
+      return Entry::onProcessMessage(msg);
+    }
+
+  };
+
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -136,7 +161,7 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in
   Label*  label     = new Label(labelText);
   Slider* absSlider = new Slider(min, max, 0);
   Slider* relSlider = new Slider(min-max, max-min, 0);
-  Entry*  entry     = new Entry(4, "0");
+  Entry*  entry     = new ColorEntry();
 
   m_label.push_back(label);
   m_absSlider.push_back(absSlider);

From 128ba903949129419ab7a87ad0828d9e39aeb1bf Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 21 Nov 2016 10:25:27 -0300
Subject: [PATCH 43/77] Add ENABLE_SCRIPTING flag

---
 CMakeLists.txt                             |  1 +
 src/CMakeLists.txt                         |  5 ++-
 src/app/CMakeLists.txt                     | 38 +++++++++++++++-------
 src/app/app.cpp                            | 15 +++++++--
 src/app/app_options.cpp                    | 12 ++++++-
 src/app/app_options.h                      |  6 ++++
 src/app/commands/cmd_developer_console.cpp |  4 +++
 src/app/commands/cmd_run_script.cpp        |  4 +++
 src/app/commands/commands_list.h           |  7 ++--
 src/app/shell.cpp                          |  4 +++
 src/app/ui/devconsole_view.cpp             |  4 +++
 src/app/ui/main_window.cpp                 |  2 ++
 12 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ec1276a6..68d4f0fc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
 option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off)
 option(ENABLE_MEMLEAK     "Enable memory-leaks detector (only for developers)" off)
 option(ENABLE_UPDATER     "Enable automatic check for updates" on)
+option(ENABLE_SCRIPTING   "Compile with scripting support" on)
 option(ENABLE_WEBSERVER   "Enable support to run a webserver (for HTML5 gamedev)" off)
 option(ENABLE_TESTS       "Enable the unit tests" off)
 option(ENABLE_TRIAL_MODE  "Compile the trial version" off)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b122d22e..e24e0a5cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -97,10 +97,13 @@ add_subdirectory(gfx)
 add_subdirectory(net)
 add_subdirectory(render)
 add_subdirectory(docio)
-add_subdirectory(script)
 add_subdirectory(she)
 add_subdirectory(ui)
 
+if(ENABLE_SCRIPTING)
+  add_subdirectory(script)
+endif()
+
 if(ENABLE_UPDATER)
   add_subdirectory(updater)
 endif()
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 3525784d7..9e5a1308e 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -60,6 +60,10 @@ if(WITH_WEBP_SUPPORT)
   add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
 endif()
 
+if(ENABLE_SCRIPTING)
+  add_definitions(-DENABLE_SCRIPTING)
+endif()
+
 ######################################################################
 # app-lib target
 
@@ -89,6 +93,23 @@ if(WITH_WEBP_SUPPORT)
   list(APPEND file_formats file/webp_format.cpp)
 endif()
 
+set(scripting_files)
+if(ENABLE_SCRIPTING)
+  set(scripting_files
+    commands/cmd_developer_console.cpp
+    commands/cmd_run_script.cpp
+    script/app_object.cpp
+    script/app_scripting.cpp
+    script/console_object.cpp
+    script/image_class.cpp
+    script/image_wrap.cpp
+    script/selection_class.cpp
+    script/sprite_class.cpp
+    script/sprite_wrap.cpp
+    shell.cpp
+    ui/devconsole_view.cpp)
+endif()
+
 add_library(app-lib
   app.cpp
   app_brushes.cpp
@@ -185,7 +206,6 @@ add_library(app-lib
   commands/cmd_crop.cpp
   commands/cmd_cut.cpp
   commands/cmd_deselect_mask.cpp
-  commands/cmd_developer_console.cpp
   commands/cmd_discard_brush.cpp
   commands/cmd_duplicate_layer.cpp
   commands/cmd_duplicate_sprite.cpp
@@ -325,17 +345,8 @@ add_library(app-lib
   res/resources_loader.cpp
   resource_finder.cpp
   rw_lock.cpp
-  script/app_object.cpp
-  script/app_scripting.cpp
-  script/console_object.cpp
-  script/image_class.cpp
-  script/image_wrap.cpp
-  script/selection_class.cpp
-  script/sprite_class.cpp
-  script/sprite_wrap.cpp
   send_crash.cpp
   shade.cpp
-  shell.cpp
   snap_to_grid.cpp
   thumbnail_generator.cpp
   tools/active_tool.cpp
@@ -364,7 +375,6 @@ add_library(app-lib
   ui/color_wheel.cpp
   ui/configure_timeline_popup.cpp
   ui/context_bar.cpp
-  ui/devconsole_view.cpp
   ui/document_view.cpp
   ui/drop_down_button.cpp
   ui/editor/brush_preview.cpp
@@ -445,6 +455,7 @@ add_library(app-lib
   xml_document.cpp
   xml_exception.cpp
   ${data_recovery_files}
+  ${scripting_files}
   ${generated_files})
 
 target_link_libraries(app-lib
@@ -460,7 +471,6 @@ target_link_libraries(app-lib
   gfx-lib
   net-lib
   render-lib
-  script-lib
   she
   ui-lib
   undo
@@ -472,6 +482,10 @@ target_link_libraries(app-lib
   ${ZLIB_LIBRARIES}
   ${FREETYPE_LIBRARIES})
 
+if(ENABLE_SCRIPTING)
+  target_link_libraries(app-lib script-lib)
+endif()
+
 if(ENABLE_UPDATER)
   target_link_libraries(app-lib updater-lib)
 endif()
diff --git a/src/app/app.cpp b/src/app/app.cpp
index b2c7167a6..70dcd25ca 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -35,9 +35,7 @@
 #include "app/pref/preferences.h"
 #include "app/recent_files.h"
 #include "app/resource_finder.h"
-#include "app/script/app_scripting.h"
 #include "app/send_crash.h"
-#include "app/shell.h"
 #include "app/tools/active_tool.h"
 #include "app/tools/tool_box.h"
 #include "app/ui/backup_indicator.h"
@@ -69,7 +67,6 @@
 #include "doc/site.h"
 #include "doc/sprite.h"
 #include "render/render.h"
-#include "script/engine_delegate.h"
 #include "she/display.h"
 #include "she/error.h"
 #include "she/system.h"
@@ -78,6 +75,12 @@
 
 #include <iostream>
 
+#ifdef ENABLE_SCRIPTING
+  #include "app/script/app_scripting.h"
+  #include "app/shell.h"
+  #include "script/engine_delegate.h"
+#endif
+
 #ifdef ENABLE_STEAM
   #include "steam/steam.h"
 #endif
@@ -135,12 +138,14 @@ public:
 
 };
 
+#ifdef ENABLE_SCRIPTING
 class StdoutEngineDelegate : public script::EngineDelegate {
 public:
   void onConsolePrint(const char* text) override {
     printf("%s\n", text);
   }
 };
+#endif
 
 App* App::m_instance = NULL;
 
@@ -521,6 +526,7 @@ void App::initialize(const AppOptions& options)
             }
           }
         }
+#ifdef ENABLE_SCRIPTING
         // --script <filename>
         else if (opt == &options.script()) {
           std::string script = value.value();
@@ -529,6 +535,7 @@ void App::initialize(const AppOptions& options)
           AppScripting engine(&delegate);
           engine.evalFile(script);
         }
+#endif
         // --list-layers
         else if (opt == &options.listLayers()) {
           listLayers = true;
@@ -696,6 +703,7 @@ void App::run()
     ui::Manager::getDefault()->run();
   }
 
+#ifdef ENABLE_SCRIPTING
   // Start shell to execute scripts.
   if (m_isShell) {
     StdoutEngineDelegate delegate;
@@ -704,6 +712,7 @@ void App::run()
     Shell shell;
     shell.run(engine);
   }
+#endif
 
   // Destroy all documents in the UIContext.
   const doc::Documents& docs = m_modules->m_ui_context.documents();
diff --git a/src/app/app_options.cpp b/src/app/app_options.cpp
index 07a7c6ef0..12d5bc144 100644
--- a/src/app/app_options.cpp
+++ b/src/app/app_options.cpp
@@ -25,7 +25,9 @@ AppOptions::AppOptions(int argc, const char* argv[])
   , m_startShell(false)
   , m_verboseLevel(kNoVerbose)
   , m_palette(m_po.add("palette").requiresValue("<filename>").description("Use a specific palette by default"))
+#ifdef ENABLE_SCRIPTING
   , m_shell(m_po.add("shell").description("Start an interactive console to execute scripts"))
+#endif
   , m_batch(m_po.add("batch").mnemonic('b').description("Do not start the UI"))
   , m_saveAs(m_po.add("save-as").requiresValue("<filename>").description("Save the last given document with other format"))
   , m_scale(m_po.add("scale").requiresValue("<factor>").description("Resize all previous opened documents"))
@@ -49,7 +51,9 @@ AppOptions::AppOptions(int argc, const char* argv[])
   , m_trim(m_po.add("trim").description("Trim all images before exporting"))
   , m_crop(m_po.add("crop").requiresValue("x,y,width,height").description("Crop all the images to the given rectangle"))
   , m_filenameFormat(m_po.add("filename-format").requiresValue("<fmt>").description("Special format to generate filenames"))
+#ifdef ENABLE_SCRIPTING
   , m_script(m_po.add("script").requiresValue("<filename>").description("Execute a specific script"))
+#endif
   , m_listLayers(m_po.add("list-layers").description("List layers of the next given sprite\nor include layers in JSON data"))
   , m_listTags(m_po.add("list-tags").description("List tags of the next given sprite sprite\nor include frame tags in JSON data"))
   , m_verbose(m_po.add("verbose").mnemonic('v').description("Explain what is being done"))
@@ -66,7 +70,9 @@ AppOptions::AppOptions(int argc, const char* argv[])
       m_verboseLevel = kVerbose;
 
     m_paletteFileName = m_po.value_of(m_palette);
+#ifdef ENABLE_SCRIPTING
     m_startShell = m_po.enabled(m_shell);
+#endif
 
     if (m_po.enabled(m_help)) {
       showHelp();
@@ -77,7 +83,11 @@ AppOptions::AppOptions(int argc, const char* argv[])
       m_startUI = false;
     }
 
-    if (m_po.enabled(m_shell) || m_po.enabled(m_batch)) {
+    if (
+#ifdef ENABLE_SCRIPTING
+        m_po.enabled(m_shell) ||
+#endif
+        m_po.enabled(m_batch)) {
       m_startUI = false;
     }
   }
diff --git a/src/app/app_options.h b/src/app/app_options.h
index cc09a8985..7da062b8c 100644
--- a/src/app/app_options.h
+++ b/src/app/app_options.h
@@ -63,7 +63,9 @@ public:
   const Option& trim() const { return m_trim; }
   const Option& crop() const { return m_crop; }
   const Option& filenameFormat() const { return m_filenameFormat; }
+#ifdef ENABLE_SCRIPTING
   const Option& script() const { return m_script; }
+#endif
   const Option& listLayers() const { return m_listLayers; }
   const Option& listTags() const { return m_listTags; }
 
@@ -81,7 +83,9 @@ private:
   std::string m_paletteFileName;
 
   Option& m_palette;
+#ifdef ENABLE_SCRIPTING
   Option& m_shell;
+#endif
   Option& m_batch;
   Option& m_saveAs;
   Option& m_scale;
@@ -105,7 +109,9 @@ private:
   Option& m_trim;
   Option& m_crop;
   Option& m_filenameFormat;
+#ifdef ENABLE_SCRIPTING
   Option& m_script;
+#endif
   Option& m_listLayers;
   Option& m_listTags;
 
diff --git a/src/app/commands/cmd_developer_console.cpp b/src/app/commands/cmd_developer_console.cpp
index f1e368d4e..65e319eea 100644
--- a/src/app/commands/cmd_developer_console.cpp
+++ b/src/app/commands/cmd_developer_console.cpp
@@ -8,6 +8,10 @@
 #include "config.h"
 #endif
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/ui/main_window.h"
diff --git a/src/app/commands/cmd_run_script.cpp b/src/app/commands/cmd_run_script.cpp
index 27c68115f..c4dbc7122 100644
--- a/src/app/commands/cmd_run_script.cpp
+++ b/src/app/commands/cmd_run_script.cpp
@@ -8,6 +8,10 @@
 #include "config.h"
 #endif
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "app/commands/command.h"
 #include "app/commands/params.h"
 #include "app/console.h"
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index b9be9ab69..7e2b5790c 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -29,7 +29,6 @@ FOR_EACH_COMMAND(CropSprite)
 FOR_EACH_COMMAND(Cut)
 FOR_EACH_COMMAND(DeselectMask)
 FOR_EACH_COMMAND(Despeckle)
-FOR_EACH_COMMAND(DeveloperConsole)
 FOR_EACH_COMMAND(DiscardBrush)
 FOR_EACH_COMMAND(DuplicateLayer)
 FOR_EACH_COMMAND(DuplicateSprite)
@@ -101,7 +100,6 @@ FOR_EACH_COMMAND(ReplaceColor)
 FOR_EACH_COMMAND(ReselectMask)
 FOR_EACH_COMMAND(ReverseFrames)
 FOR_EACH_COMMAND(Rotate)
-FOR_EACH_COMMAND(RunScript)
 FOR_EACH_COMMAND(SaveFile)
 FOR_EACH_COMMAND(SaveFileAs)
 FOR_EACH_COMMAND(SaveFileCopyAs)
@@ -136,3 +134,8 @@ FOR_EACH_COMMAND(Undo)
 FOR_EACH_COMMAND(UndoHistory)
 FOR_EACH_COMMAND(UnlinkCel)
 FOR_EACH_COMMAND(Zoom)
+
+#ifdef ENABLE_SCRIPTING
+FOR_EACH_COMMAND(DeveloperConsole)
+FOR_EACH_COMMAND(RunScript)
+#endif
diff --git a/src/app/shell.cpp b/src/app/shell.cpp
index df3f986df..ab013de76 100644
--- a/src/app/shell.cpp
+++ b/src/app/shell.cpp
@@ -8,6 +8,10 @@
 #include "config.h"
 #endif
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "app/shell.h"
 
 #include "script/engine.h"
diff --git a/src/app/ui/devconsole_view.cpp b/src/app/ui/devconsole_view.cpp
index cfced5601..a01828807 100644
--- a/src/app/ui/devconsole_view.cpp
+++ b/src/app/ui/devconsole_view.cpp
@@ -8,6 +8,10 @@
 #include "config.h"
 #endif
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "app/ui/devconsole_view.h"
 
 #include "app/app_menus.h"
diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp
index 5efcc84cd..ea0242666 100644
--- a/src/app/ui/main_window.cpp
+++ b/src/app/ui/main_window.cpp
@@ -241,6 +241,7 @@ bool MainWindow::isHomeSelected()
 
 void MainWindow::showDevConsole()
 {
+#ifdef ENABLE_SCRIPTING
   if (!m_devConsoleView)
     m_devConsoleView = new DevConsoleView;
 
@@ -248,6 +249,7 @@ void MainWindow::showDevConsole()
     m_workspace->addView(m_devConsoleView);
     m_tabsBar->selectTab(m_devConsoleView);
   }
+#endif
 }
 
 void MainWindow::setMode(Mode mode)

From d444f5b78eacb2db7654288c9848cabe6a2a5f61 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 21 Nov 2016 10:37:54 -0300
Subject: [PATCH 44/77] Minor change in Manager::processFocusMovementMessage

---
 src/ui/manager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index fdb8d8226..060c9b368 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1533,6 +1533,9 @@ void Manager::broadcastKeyMsg(Message* msg)
                             Focus Movement
  ***********************************************************************/
 
+// TODO rewrite this function, it is based in an old code from the
+//      Allegro library GUI code
+
 bool Manager::processFocusMovementMessage(Message* msg)
 {
   int (*cmp)(Widget*, int, int) = NULL;
@@ -1612,7 +1615,7 @@ bool Manager::processFocusMovementMessage(Message* msg)
           for (i=c; i<count-1; i++) {
             for (j=i+1; j<count; j++) {
               // Sort the list in ascending order
-              if ((*cmp) (list[i], x, y) > (*cmp) (list[j], x, y)) {
+              if ((*cmp)(list[i], x, y) > (*cmp)(list[j], x, y)) {
                 Widget* tmp = list[i];
                 list[i] = list[j];
                 list[j] = tmp;
@@ -1621,7 +1624,7 @@ bool Manager::processFocusMovementMessage(Message* msg)
           }
 
           // Check if the new widget to put the focus is not in the wrong way.
-          if ((*cmp) (list[c], x, y) < std::numeric_limits<int>::max())
+          if ((*cmp)(list[c], x, y) < std::numeric_limits<int>::max())
             focus = list[c];
         }
         // If only there are one widget, put the focus in this

From b6076e6732dcacbd80d8940911b7591c76ce4778 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 21 Nov 2016 12:28:42 -0300
Subject: [PATCH 45/77] Fix "magnet enter" when we are in a ui::Entry

Pressing Enter on a ui::Entry will press "OK" buttons.
---
 src/ui/entry.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index 9b2b4d76a..ecd05ba29 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -314,9 +314,6 @@ bool Entry::onProcessMessage(Message* msg)
                 case kKeyA: cmd = EntryCmd::SelectAll; break;
               }
             }
-            else if (manager()->isFocusMovementMessage(msg)) {
-              return Widget::onProcessMessage(msg);
-            }
             break;
         }
 
@@ -329,8 +326,11 @@ bool Entry::onProcessMessage(Message* msg)
             if (keymsg->isDeadKey()) {
               selectText(m_caret-1, m_caret);
             }
+            return true;
+          }
+          else {
+            break;              // Propagate to manager
           }
-          return true;
         }
 
         executeCmd(cmd, keymsg->unicodeChar(),

From 54da860a006c55a4b157fc3740b5ff4663e2ad13 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 21 Nov 2016 17:59:09 -0300
Subject: [PATCH 46/77] Minor change in
 CustomizedGuiManager::onProcessMessage()

---
 src/app/modules/gui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index e45aa812a..fc47b546c 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -389,7 +389,7 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
       // Ctrl+Shift+Q generates a crash (useful to test the anticrash feature)
       if (msg->ctrlPressed() &&
           msg->shiftPressed() &&
-          static_cast<KeyMessage*>(msg)->scancode() == kKeyQ) {
+          keymsg->scancode() == kKeyQ) {
         int* p = nullptr;
         *p = 0;
       }

From f985e6c6c024c54d1fc38df3c2a0b363d9c4db67 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 21 Nov 2016 18:03:06 -0300
Subject: [PATCH 47/77] Some improvements to the color selection UI (#1019)

* Tab and Shift+Tab keys cycle through RGB/HSB text fields
* Sliders don't get the keyboard focus (only text fields)
* Up/Down keys increase/decrease the text field value
---
 src/app/commands/cmd_palette_editor.cpp |   8 +-
 src/app/ui/color_popup.cpp              |  10 +--
 src/app/ui/color_sliders.cpp            | 105 +++++++++++++++++++++---
 src/app/ui/color_sliders.h              |   1 +
 src/app/ui/hex_color_entry.cpp          |  22 ++++-
 src/app/ui/hex_color_entry.h            |   9 +-
 src/app/ui/popup_window_pin.cpp         |   1 +
 src/app/ui/skin/skin_theme.cpp          |   8 +-
 8 files changed, 141 insertions(+), 23 deletions(-)

diff --git a/src/app/commands/cmd_palette_editor.cpp b/src/app/commands/cmd_palette_editor.cpp
index 1cb18c8a7..30eee3afb 100644
--- a/src/app/commands/cmd_palette_editor.cpp
+++ b/src/app/commands/cmd_palette_editor.cpp
@@ -251,10 +251,10 @@ PaletteEntryEditor::PaletteEntryEditor()
   , m_selfPalChange(false)
   , m_fromPalette(0, 0)
 {
-  m_colorType.addItem("RGB");
-  m_colorType.addItem("HSB");
-  m_changeMode.addItem("Abs");
-  m_changeMode.addItem("Rel");
+  m_colorType.addItem("RGB")->setFocusStop(false);
+  m_colorType.addItem("HSB")->setFocusStop(false);
+  m_changeMode.addItem("Abs")->setFocusStop(false);
+  m_changeMode.addItem("Rel")->setFocusStop(false);
 
   m_topBox.setBorder(gfx::Border(0));
   m_topBox.setChildSpacing(0);
diff --git a/src/app/ui/color_popup.cpp b/src/app/ui/color_popup.cpp
index 979f2e108..dd80e1a4d 100644
--- a/src/app/ui/color_popup.cpp
+++ b/src/app/ui/color_popup.cpp
@@ -58,11 +58,11 @@ ColorPopup::ColorPopup(bool canPin)
   , m_canPin(canPin)
   , m_disableHexUpdate(false)
 {
-  m_colorType.addItem("Index");
-  m_colorType.addItem("RGB");
-  m_colorType.addItem("HSB");
-  m_colorType.addItem("Gray");
-  m_colorType.addItem("Mask");
+  m_colorType.addItem("Index")->setFocusStop(false);
+  m_colorType.addItem("RGB")->setFocusStop(false);
+  m_colorType.addItem("HSB")->setFocusStop(false);
+  m_colorType.addItem("Gray")->setFocusStop(false);
+  m_colorType.addItem("Mask")->setFocusStop(false);
 
   m_topBox.setBorder(gfx::Border(0));
   m_topBox.setChildSpacing(0);
diff --git a/src/app/ui/color_sliders.cpp b/src/app/ui/color_sliders.cpp
index 53fd0576a..f55d75ffd 100644
--- a/src/app/ui/color_sliders.cpp
+++ b/src/app/ui/color_sliders.cpp
@@ -13,6 +13,7 @@
 #include "app/ui/skin/skin_slider_property.h"
 #include "app/ui/skin/skin_theme.h"
 #include "base/bind.h"
+#include "base/scoped_value.h"
 #include "ui/box.h"
 #include "ui/entry.h"
 #include "ui/graphics.h"
@@ -84,26 +85,100 @@ namespace {
 
   class ColorEntry : public Entry {
   public:
-    ColorEntry() : Entry(4, "0") {
+    ColorEntry(Slider* absSlider, Slider* relSlider)
+      : Entry(4, "0")
+      , m_absSlider(absSlider)
+      , m_relSlider(relSlider)
+      , m_recent_focus(false) {
+    }
+
+  private:
+    int minValue() const {
+      if (m_absSlider->isVisible())
+        return m_absSlider->getMinValue();
+      else if (m_relSlider->isVisible())
+        return m_relSlider->getMinValue();
+      else
+        return 0;
+    }
+
+    int maxValue() const {
+      if (m_absSlider->isVisible())
+        return m_absSlider->getMaxValue();
+      else if (m_relSlider->isVisible())
+        return m_relSlider->getMaxValue();
+      else
+        return 0;
     }
 
     bool onProcessMessage(Message* msg) override {
       switch (msg->type()) {
 
+        case kFocusEnterMessage:
+          m_recent_focus = true;
+          break;
+
         case kKeyDownMessage:
           if (Entry::onProcessMessage(msg))
             return true;
-          // Process focus movement key here because if our
-          // CustomizedGuiManager catches this kKeyDownMessage it will
-          // process it as a shortcut to switch the Timeline.
-          else if (manager()->processFocusMovementMessage(msg))
-            return true;
-          else
-            return false;
+
+          if (hasFocus()) {
+            int scancode = static_cast<KeyMessage*>(msg)->scancode();
+
+            switch (scancode) {
+              // Enter just remove the focus
+              case kKeyEnter:
+              case kKeyEnterPad:
+                releaseFocus();
+                return true;
+
+              case kKeyDown:
+              case kKeyUp: {
+                int value = textInt();
+                if (scancode == kKeyDown)
+                  --value;
+                else
+                  ++value;
+
+                setTextf("%d", MID(minValue(), value, maxValue()));
+                selectAllText();
+
+                onChange();
+                return true;
+              }
+            }
+
+            // Process focus movement key here because if our
+            // CustomizedGuiManager catches this kKeyDownMessage it
+            // will process it as a shortcut to switch the Timeline.
+            //
+            // Note: The default ui::Manager handles focus movement
+            // shortcuts only for foreground windows.
+            // TODO maybe that should change
+            if (hasFocus() &&
+                manager()->processFocusMovementMessage(msg))
+              return true;
+          }
+          return false;
       }
-      return Entry::onProcessMessage(msg);
+
+      bool result = Entry::onProcessMessage(msg);
+
+      if (msg->type() == kMouseDownMessage && m_recent_focus) {
+        m_recent_focus = false;
+        selectAllText();
+      }
+
+      return result;
     }
 
+    Slider* m_absSlider;
+    Slider* m_relSlider;
+
+    // TODO remove this calling setFocus() in
+    //      Widget::onProcessMessage() instead of
+    //      Manager::handleWindowZOrder()
+    bool m_recent_focus;
   };
 
 }
@@ -115,6 +190,7 @@ ColorSliders::ColorSliders()
   : Widget(kGenericWidget)
   , m_grid(3, false)
   , m_mode(Absolute)
+  , m_lockEntry(-1)
 {
   addChild(&m_grid);
   m_grid.setChildSpacing(0);
@@ -161,7 +237,7 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in
   Label*  label     = new Label(labelText);
   Slider* absSlider = new Slider(min, max, 0);
   Slider* relSlider = new Slider(min-max, max-min, 0);
-  Entry*  entry     = new ColorEntry();
+  Entry*  entry     = new ColorEntry(absSlider, relSlider);
 
   m_label.push_back(label);
   m_absSlider.push_back(absSlider);
@@ -180,6 +256,8 @@ void ColorSliders::addSlider(Channel channel, const char* labelText, int min, in
   HBox* box = new HBox();
   box->addChild(absSlider);
   box->addChild(relSlider);
+  absSlider->setFocusStop(false);
+  relSlider->setFocusStop(false);
   absSlider->setExpansive(true);
   relSlider->setExpansive(true);
   relSlider->setVisible(false);
@@ -218,6 +296,8 @@ void ColorSliders::onSliderChange(int i)
 
 void ColorSliders::onEntryChange(int i)
 {
+  base::ScopedValue<int> lock(m_lockEntry, i, m_lockEntry);
+
   // Update the slider related to the changed entry widget.
   int value = m_entry[i]->textInt();
 
@@ -245,10 +325,15 @@ void ColorSliders::onControlChange(int i)
 // Updates the entry related to the changed slider widget.
 void ColorSliders::updateEntryText(int entryIndex)
 {
+  if (m_lockEntry == entryIndex)
+    return;
+
   Slider* slider = (m_mode == Absolute ? m_absSlider[entryIndex]:
                                          m_relSlider[entryIndex]);
 
   m_entry[entryIndex]->setTextf("%d", slider->getValue());
+  if (m_entry[entryIndex]->hasFocus())
+    m_entry[entryIndex]->selectAllText();
 }
 
 void ColorSliders::updateSlidersBgColor(const app::Color& color)
diff --git a/src/app/ui/color_sliders.h b/src/app/ui/color_sliders.h
index 16747825e..19dc89c2e 100644
--- a/src/app/ui/color_sliders.h
+++ b/src/app/ui/color_sliders.h
@@ -72,6 +72,7 @@ namespace app {
     std::vector<Channel> m_channel;
     ui::Grid m_grid;
     Mode m_mode;
+    int m_lockEntry;
   };
 
   //////////////////////////////////////////////////////////////////////
diff --git a/src/app/ui/hex_color_entry.cpp b/src/app/ui/hex_color_entry.cpp
index 66a6b6ea6..fe7edb40b 100644
--- a/src/app/ui/hex_color_entry.cpp
+++ b/src/app/ui/hex_color_entry.cpp
@@ -14,21 +14,41 @@
 #include "app/ui/hex_color_entry.h"
 #include "base/hex.h"
 #include "gfx/border.h"
+#include "ui/message.h"
 #include "ui/theme.h"
 
 namespace app {
 
 using namespace ui;
 
+HexColorEntry::CustomEntry::CustomEntry()
+  : Entry(16, "")
+{
+}
+
+bool HexColorEntry::CustomEntry::onProcessMessage(ui::Message* msg)
+{
+  switch (msg->type()) {
+    case kMouseDownMessage:
+      setFocusStop(true);
+      requestFocus();
+      break;
+    case kFocusLeaveMessage:
+      setFocusStop(false);
+      break;
+  }
+  return Entry::onProcessMessage(msg);
+}
+
 HexColorEntry::HexColorEntry()
   : Box(HORIZONTAL)
   , m_label("#")
-  , m_entry(16, "")
 {
   addChild(&m_label);
   addChild(&m_entry);
 
   m_entry.Change.connect(&HexColorEntry::onEntryChange, this);
+  m_entry.setFocusStop(false);
 
   initTheme();
 
diff --git a/src/app/ui/hex_color_entry.h b/src/app/ui/hex_color_entry.h
index 3eecfea25..30f221607 100644
--- a/src/app/ui/hex_color_entry.h
+++ b/src/app/ui/hex_color_entry.h
@@ -30,8 +30,15 @@ namespace app {
     void onEntryChange();
 
   private:
+    class CustomEntry : public ui::Entry {
+    public:
+      CustomEntry();
+    private:
+      bool onProcessMessage(ui::Message* msg) override;
+    };
+
     ui::Label m_label;
-    ui::Entry m_entry;
+    CustomEntry m_entry;
   };
 
 } // namespace app
diff --git a/src/app/ui/popup_window_pin.cpp b/src/app/ui/popup_window_pin.cpp
index 2dd6192a2..35bf90b60 100644
--- a/src/app/ui/popup_window_pin.cpp
+++ b/src/app/ui/popup_window_pin.cpp
@@ -32,6 +32,7 @@ PopupWindowPin::PopupWindowPin(const std::string& text, ClickBehavior clickBehav
 {
   SkinTheme* theme = SkinTheme::instance();
 
+  m_pin.setFocusStop(false);
   m_pin.Click.connect(&PopupWindowPin::onPinClick, this);
   m_pin.setIconInterface(
     new ButtonIconImpl(theme->parts.unpinned(),
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 7c8a8930e..25c42ad46 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -895,9 +895,13 @@ void SkinTheme::paintCheckBox(PaintEvent& ev)
   if (iconInterface)
     paintIcon(widget, g, iconInterface, icon.x, icon.y);
 
-  // draw focus
-  if (look != WithoutBordersLook && widget->hasFocus())
+  // Draw focus
+  if (look != WithoutBordersLook &&
+      (widget->hasFocus() || (iconInterface &&
+                              widget->text().empty() &&
+                              widget->hasMouseOver()))) {
     drawRect(g, bounds, parts.checkFocus().get(), gfx::ColorNone);
+  }
 }
 
 void SkinTheme::paintGrid(PaintEvent& ev)

From b2a25954d4bc070c1293b6effc9a781f26c19e74 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 09:25:23 -0300
Subject: [PATCH 48/77] Add smooth scroll w/macOS trackpad to more widgets

---
 src/app/ui/file_list.cpp    |  7 ++++++-
 src/app/ui/palette_view.cpp | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/file_list.cpp b/src/app/ui/file_list.cpp
index f45c94c37..27d7a63f4 100644
--- a/src/app/ui/file_list.cpp
+++ b/src/app/ui/file_list.cpp
@@ -279,7 +279,12 @@ bool FileList::onProcessMessage(Message* msg)
       View* view = View::getView(this);
       if (view) {
         gfx::Point scroll = view->viewScroll();
-        scroll += static_cast<MouseMessage*>(msg)->wheelDelta() * 3*(textHeight()+4*guiscale());
+
+        if (static_cast<MouseMessage*>(msg)->preciseWheel())
+          scroll += static_cast<MouseMessage*>(msg)->wheelDelta();
+        else
+          scroll += static_cast<MouseMessage*>(msg)->wheelDelta() * 3*(textHeight()+4*guiscale());
+
         view->setViewScroll(scroll);
       }
       break;
diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp
index 5aa37707c..5fa18f290 100644
--- a/src/app/ui/palette_view.cpp
+++ b/src/app/ui/palette_view.cpp
@@ -382,13 +382,19 @@ bool PaletteView::onProcessMessage(Message* msg)
 
       gfx::Point delta = static_cast<MouseMessage*>(msg)->wheelDelta();
 
-      if (msg->onlyCtrlPressed()) {
+      if (msg->onlyCtrlPressed() ||
+          msg->onlyCmdPressed()) {
         int z = delta.x - delta.y;
         setBoxSize(m_boxsize + z);
       }
       else {
         gfx::Point scroll = view->viewScroll();
-        scroll += delta * 3 * m_boxsize;
+
+        if (static_cast<MouseMessage*>(msg)->preciseWheel())
+          scroll += delta;
+        else
+          scroll += delta * 3 * m_boxsize;
+
         view->setViewScroll(scroll);
       }
       break;

From a67589aa0598dd55b8f0e11d7690ffbedfb7e74f Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 10:34:00 -0300
Subject: [PATCH 49/77] Fix Ctrl+A/C/V/X on RGB/HSV text fields

---
 src/she/keys.h   | 44 ++++++++++++++++++++++----------------------
 src/ui/entry.cpp |  8 +++++++-
 src/ui/keys.h    |  4 ++--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/she/keys.h b/src/she/keys.h
index 1bab36311..fc088beaf 100644
--- a/src/she/keys.h
+++ b/src/she/keys.h
@@ -125,30 +125,30 @@ namespace she {
     kKeyCircumflex   = 100,
     kKeyColon2       = 101,
     kKeyKanji        = 102,
-    kKeyEqualsPad    = 103,  // MacOS X
-    kKeyBackquote    = 104,  // MacOS X
-    kKeySemicolon    = 105,  // MacOS X
-    kKeyCommand      = 106,  // MacOS X
-    kKeyUnknown1     = 107,
-    kKeyUnknown2     = 108,
-    kKeyUnknown3     = 109,
-    kKeyUnknown4     = 110,
-    kKeyUnknown5     = 111,
-    kKeyUnknown6     = 112,
-    kKeyUnknown7     = 113,
-    kKeyUnknown8     = 114,
+    kKeyEqualsPad    = 103,  // macOS
+    kKeyBackquote    = 104,  // macOS
+    kKeySemicolon    = 105,  // macOS
+    kKeyUnknown1     = 106,
+    kKeyUnknown2     = 107,
+    kKeyUnknown3     = 108,
+    kKeyUnknown4     = 109,
+    kKeyUnknown5     = 110,
+    kKeyUnknown6     = 111,
+    kKeyUnknown7     = 112,
+    kKeyUnknown8     = 113,
 
-    kKeyFirstModifierScancode = 115,
+    kKeyFirstModifierScancode = 114,
 
-    kKeyLShift       = 115,
-    kKeyRShift       = 116,
-    kKeyLControl     = 117,
-    kKeyRControl     = 118,
-    kKeyAlt          = 119,
-    kKeyAltGr        = 120,
-    kKeyLWin         = 121,
-    kKeyRWin         = 122,
-    kKeyMenu         = 123,
+    kKeyLShift       = 114,
+    kKeyRShift       = 115,
+    kKeyLControl     = 116,
+    kKeyRControl     = 117,
+    kKeyAlt          = 118,
+    kKeyAltGr        = 119,
+    kKeyLWin         = 120,
+    kKeyRWin         = 121,
+    kKeyMenu         = 122,
+    kKeyCommand      = 123,  // macOS - TODO This should be inside the modifiers range
     kKeyScrLock      = 124,
     kKeyNumLock      = 125,
     kKeyCapsLock     = 126,
diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index ecd05ba29..ce125a91a 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -300,7 +300,7 @@ bool Entry::onProcessMessage(Message* msg)
             break;
 
           default:
-            // Map common Windows shortcuts for Cut/Copy/Paste
+            // Map common macOS/Windows shortcuts for Cut/Copy/Paste/Select all
 #if defined __APPLE__
             if (msg->onlyCmdPressed())
 #else
@@ -328,6 +328,12 @@ bool Entry::onProcessMessage(Message* msg)
             }
             return true;
           }
+          // Consume all key down of modifiers only, e.g. so the user
+          // can press first "Ctrl" key, and then "Ctrl+C"
+          // combination.
+          else if (keymsg->scancode() >= kKeyFirstModifierScancode) {
+            return true;
+          }
           else {
             break;              // Propagate to manager
           }
diff --git a/src/ui/keys.h b/src/ui/keys.h
index 25a99547c..cc99559f5 100644
--- a/src/ui/keys.h
+++ b/src/ui/keys.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -130,7 +130,6 @@ namespace ui {
   using she::kKeyEqualsPad;
   using she::kKeyBackquote;
   using she::kKeySemicolon;
-  using she::kKeyCommand;
   using she::kKeyUnknown1;
   using she::kKeyUnknown2;
   using she::kKeyUnknown3;
@@ -151,6 +150,7 @@ namespace ui {
   using she::kKeyLWin;
   using she::kKeyRWin;
   using she::kKeyMenu;
+  using she::kKeyCommand;
   using she::kKeyScrLock;
   using she::kKeyNumLock;
   using she::kKeyCapsLock;

From aee2b87dd623c7fe3c554f0597bba3c4c6e533f9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 10:34:55 -0300
Subject: [PATCH 50/77] Add kKeyMenu in win32vk_to_scancode()

---
 src/she/win/vk.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/she/win/vk.cpp b/src/she/win/vk.cpp
index 8cf6278db..f5b6355a1 100644
--- a/src/she/win/vk.cpp
+++ b/src/she/win/vk.cpp
@@ -114,7 +114,7 @@ KeyScancode win32vk_to_scancode(int vk)
     kKeyZ, // 0x5A - VK_Z
     kKeyLWin, // 0x5B - VK_LWIN
     kKeyRWin, // 0x5C - VK_RWIN
-    kKeyNil, // 0x5D - VK_APPS
+    kKeyMenu, // 0x5D - VK_APPS
     kKeyNil, // 0x5E - Reserved
     kKeyNil, // 0x5F - VK_SLEEP
     // 0x60

From 096b26fea6308635b3c161f09c7fa1c3e0e6914a Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 10:51:03 -0300
Subject: [PATCH 51/77] Fix Space keyboard modifier to scroll the Editor

---
 src/ui/accelerator.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ui/accelerator.cpp b/src/ui/accelerator.cpp
index 732f6e639..8865f9e93 100644
--- a/src/ui/accelerator.cpp
+++ b/src/ui/accelerator.cpp
@@ -307,7 +307,11 @@ std::string Accelerator::toString() const
   if (m_modifiers & kKeyCmdModifier) buf += "Cmd+";
   if (m_modifiers & kKeyAltModifier) buf += "Alt+";
   if (m_modifiers & kKeyShiftModifier) buf += "Shift+";
-  if (m_modifiers & kKeySpaceModifier) buf += "Space+";
+  if ((m_modifiers & kKeySpaceModifier) &&
+      (m_scancode != kKeySpace) &&
+      (m_unicodeChar != ' ')) {
+    buf += "Space+";
+  }
   if (m_modifiers & kKeyWinModifier) {
     buf += kWinKeyName;
     buf += "+";

From 461d311dff1ecd75e555b072b7d466d31c25d435 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 11:54:15 -0300
Subject: [PATCH 52/77] Fix several buffer overflows using
 base::string_printf()

---
 laf                       |  2 +-
 src/app/console.cpp       | 18 +++++++++---------
 src/app/ui/status_bar.cpp | 30 +++++++++++++-----------------
 src/app/ui/status_bar.h   |  4 ++--
 src/ui/alert.cpp          | 37 +++++++++++++++----------------------
 src/ui/alert.h            |  3 ++-
 6 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/laf b/laf
index 381923970..42ad03a9a 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 381923970189e1af76f03f03ebf6877d7610451a
+Subproject commit 42ad03a9a30ebe619674aaf07ef27cf442133903
diff --git a/src/app/console.cpp b/src/app/console.cpp
index d859fb778..d600d47d0 100644
--- a/src/app/console.cpp
+++ b/src/app/console.cpp
@@ -8,11 +8,13 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/memory.h"
+#include "base/string.h"
 #include "ui/ui.h"
 
 #include "app/app.h"
@@ -106,15 +108,13 @@ Console::~Console()
 
 void Console::printf(const char* format, ...)
 {
-  char buf[4096];               // TODO warning buffer overflow
-  va_list ap;
-
+  std::va_list ap;
   va_start(ap, format);
-  vsprintf(buf, format, ap);
+  std::string msg = base::string_vprintf(format, ap);
   va_end(ap);
 
   if (!m_withUI || !wid_console) {
-    fputs(buf, stdout);
+    fputs(msg.c_str(), stdout);
     fflush(stdout);
     return;
   }
@@ -125,7 +125,7 @@ void Console::printf(const char* format, ...)
     ui::Manager::getDefault()->invalidate();
   }
 
-  /* update the textbox */
+  // Update the textbox
   if (!console_locked) {
     console_locked = true;
 
@@ -142,7 +142,7 @@ void Console::printf(const char* format, ...)
   std::string final;
   if (!text.empty())
     final += text;
-  final += buf;
+  final += msg;
 
   wid_textbox->setText(final.c_str());
 }
diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index 5f454a355..25cc8437f 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -35,6 +35,7 @@
 #include "app/ui_context.h"
 #include "app/util/range_utils.h"
 #include "base/bind.h"
+#include "base/string.h"
 #include "doc/document_event.h"
 #include "doc/image.h"
 #include "doc/layer.h"
@@ -611,17 +612,15 @@ void StatusBar::showBackupIcon(BackupIcon icon)
   m_indicators->showBackupIcon(icon);
 }
 
-bool StatusBar::setStatusText(int msecs, const char *format, ...)
+bool StatusBar::setStatusText(int msecs, const char* format, ...)
 {
   if ((base::current_tick() > m_timeout) || (msecs > 0)) {
-    char buf[256];              // TODO warning buffer overflow
-    va_list ap;
-
+    std::va_list ap;
     va_start(ap, format);
-    vsprintf(buf, format, ap);
+    std::string msg = base::string_vprintf(format, ap);
     va_end(ap);
 
-    IndicatorsGeneration(m_indicators).add(buf);
+    IndicatorsGeneration(m_indicators).add(msg.c_str());
     m_timeout = base::current_tick() + msecs;
     return true;
   }
@@ -629,21 +628,18 @@ bool StatusBar::setStatusText(int msecs, const char *format, ...)
     return false;
 }
 
-void StatusBar::showTip(int msecs, const char *format, ...)
+void StatusBar::showTip(int msecs, const char* format, ...)
 {
-  char buf[256];                // TODO warning buffer overflow
-  va_list ap;
-  int x, y;
-
+  std::va_list ap;
   va_start(ap, format);
-  vsprintf(buf, format, ap);
+  std::string msg = base::string_vprintf(format, ap);
   va_end(ap);
 
   if (m_tipwindow == NULL) {
-    m_tipwindow = new CustomizedTipWindow(buf);
+    m_tipwindow = new CustomizedTipWindow(msg);
   }
   else {
-    m_tipwindow->setText(buf);
+    m_tipwindow->setText(msg);
   }
 
   m_tipwindow->setInterval(msecs);
@@ -654,14 +650,14 @@ void StatusBar::showTip(int msecs, const char *format, ...)
   m_tipwindow->openWindow();
   m_tipwindow->remapWindow();
 
-  x = bounds().x2() - m_tipwindow->bounds().w;
-  y = bounds().y - m_tipwindow->bounds().h;
+  int x = bounds().x2() - m_tipwindow->bounds().w;
+  int y = bounds().y - m_tipwindow->bounds().h;
   m_tipwindow->positionWindow(x, y);
 
   m_tipwindow->startTimer();
 
   // Set the text in status-bar (with inmediate timeout)
-  IndicatorsGeneration(m_indicators).add(buf);
+  IndicatorsGeneration(m_indicators).add(msg.c_str());
   m_timeout = base::current_tick();
 }
 
diff --git a/src/app/ui/status_bar.h b/src/app/ui/status_bar.h
index 7b9ce2ce2..b16952ebc 100644
--- a/src/app/ui/status_bar.h
+++ b/src/app/ui/status_bar.h
@@ -58,8 +58,8 @@ namespace app {
 
     void clearText();
 
-    bool setStatusText(int msecs, const char *format, ...);
-    void showTip(int msecs, const char *format, ...);
+    bool setStatusText(int msecs, const char* format, ...);
+    void showTip(int msecs, const char* format, ...);
     void showColor(int msecs, const char* text, const Color& color);
     void showTool(int msecs, tools::Tool* tool);
     void showSnapToGridWarning(bool state);
diff --git a/src/ui/alert.cpp b/src/ui/alert.cpp
index aaf99f47b..29380ee51 100644
--- a/src/ui/alert.cpp
+++ b/src/ui/alert.cpp
@@ -35,6 +35,7 @@
 #include "ui/alert.h"
 
 #include "base/bind.h"
+#include "base/string.h"
 #include "ui/box.h"
 #include "ui/button.h"
 #include "ui/grid.h"
@@ -73,34 +74,30 @@ void Alert::setProgress(double progress)
 
 AlertPtr Alert::create(const char* format, ...)
 {
-  char buf[4096];               // TODO warning buffer overflow
-  va_list ap;
-
   // Process arguments
+  std::va_list ap;
   va_start(ap, format);
-  vsprintf(buf, format, ap);
+  std::string msg = base::string_vprintf(format, ap);
   va_end(ap);
 
   // Create the alert window
   AlertPtr window(new Alert());
-  window->processString(buf);
+  window->processString(msg);
   return window;
 }
 
 // static
 int Alert::show(const char* format, ...)
 {
-  char buf[4096];               // TODO warning buffer overflow
-  va_list ap;
-
   // Process arguments
+  std::va_list ap;
   va_start(ap, format);
-  vsprintf(buf, format, ap);
+  std::string msg = base::string_vprintf(format, ap);
   va_end(ap);
 
   // Create the alert window
   AlertPtr window(new Alert());
-  window->processString(buf);
+  window->processString(msg);
   return window->show();
 }
 
@@ -124,19 +121,18 @@ int Alert::show()
   return ret;
 }
 
-void Alert::processString(char* buf)
+void Alert::processString(std::string& buf)
 {
   bool title = true;
   bool label = false;
   bool separator = false;
   bool button = false;
   int align = 0;
-  char *beg;
-  int c, chr;
+  int c, beg;
 
   // Process buffer
   c = 0;
-  beg = buf;
+  beg = 0;
   for (; ; c++) {
     if ((!buf[c]) ||
         ((buf[c] == buf[c+1]) &&
@@ -146,14 +142,13 @@ void Alert::processString(char* buf)
           (buf[c] == '-') ||
           (buf[c] == '|')))) {
       if (title || label || separator || button) {
-        chr = buf[c];
-        buf[c] = 0;
+        std::string item = buf.substr(beg, c-beg);
 
         if (title) {
-          setText(beg);
+          setText(item);
         }
         else if (label) {
-          Label* label = new Label(beg);
+          Label* label = new Label(item);
           label->setAlign(align);
           m_labels.push_back(label);
         }
@@ -162,7 +157,7 @@ void Alert::processString(char* buf)
         }
         else if (button) {
           char buttonId[256];
-          Button* button_widget = new Button(beg);
+          Button* button_widget = new Button(item);
           button_widget->setMinSize(gfx::Size(60*guiscale(), 0));
           m_buttons.push_back(button_widget);
 
@@ -170,8 +165,6 @@ void Alert::processString(char* buf)
           button_widget->setId(buttonId);
           button_widget->Click.connect(base::Bind<void>(&Window::closeWindow, this, button_widget));
         }
-
-        buf[c] = chr;
       }
 
       // Done
@@ -180,7 +173,7 @@ void Alert::processString(char* buf)
       // Next widget
       else {
         title = label = separator = button = false;
-        beg = buf+c+2;
+        beg = c+2;
         align = 0;
 
         switch (buf[c]) {
diff --git a/src/ui/alert.h b/src/ui/alert.h
index 2b8731751..37c30709f 100644
--- a/src/ui/alert.h
+++ b/src/ui/alert.h
@@ -11,6 +11,7 @@
 #include "base/shared_ptr.h"
 #include "ui/window.h"
 
+#include <string>
 #include <vector>
 
 namespace ui {
@@ -34,7 +35,7 @@ namespace ui {
     static int show(const char* format, ...);
 
   private:
-    void processString(char* buf);
+    void processString(std::string& buf);
 
     Slider* m_progress;
     Box* m_progressPlaceholder;

From 43a225afe0217c698896a92e20f1cb627e718bcf Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 12:08:55 -0300
Subject: [PATCH 53/77] Avoid focus on a hidden widget in RGB/HSB text fields

---
 src/app/ui/color_popup.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/ui/color_popup.cpp b/src/app/ui/color_popup.cpp
index dd80e1a4d..147e8b5ae 100644
--- a/src/app/ui/color_popup.cpp
+++ b/src/app/ui/color_popup.cpp
@@ -260,6 +260,9 @@ void ColorPopup::selectColorType(app::Color::Type type)
     case app::Color::MaskType:  m_colorType.setSelectedItem(MASK_MODE); break;
   }
 
+  // Remove focus from some RGB/HSB text entry
+  manager()->freeFocus();
+
   m_vbox.layout();
   m_vbox.invalidate();
 }

From d5d71257feeb331f8a3f8c6729031e16b808f698 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 12:46:23 -0300
Subject: [PATCH 54/77] Remove comment from TextBox::onSizeHint()

---
 src/ui/textbox.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ui/textbox.cpp b/src/ui/textbox.cpp
index f8c65bcde..0a7badd32 100644
--- a/src/ui/textbox.cpp
+++ b/src/ui/textbox.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -152,10 +152,6 @@ void TextBox::onSizeHint(SizeHintEvent& ev)
   int w = 0;
   int h = 0;
 
-  // TODO is it necessary?
-  //w = widget->border_width.l + widget->border_width.r;
-  //h = widget->border_width.t + widget->border_width.b;
-
   drawTextBox(NULL, this, &w, &h, gfx::ColorNone, gfx::ColorNone);
 
   if (this->align() & WORDWRAP) {

From 5828df1383e057d419ee6dd5e89f42de9420b7fa Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 12:46:42 -0300
Subject: [PATCH 55/77] Add smooth scroll to ui::TextBox

---
 src/ui/textbox.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ui/textbox.cpp b/src/ui/textbox.cpp
index 0a7badd32..ded466bdb 100644
--- a/src/ui/textbox.cpp
+++ b/src/ui/textbox.cpp
@@ -129,9 +129,13 @@ bool TextBox::onProcessMessage(Message* msg)
     case kMouseWheelMessage: {
       View* view = View::getView(this);
       if (view) {
+        auto mouseMsg = static_cast<MouseMessage*>(msg);
         gfx::Point scroll = view->viewScroll();
 
-        scroll += static_cast<MouseMessage*>(msg)->wheelDelta() * textHeight()*3;
+        if (mouseMsg->preciseWheel())
+          scroll += mouseMsg->wheelDelta();
+        else
+          scroll += mouseMsg->wheelDelta() * textHeight()*3;
 
         view->setViewScroll(scroll);
       }

From 0ed0ad287cb8cb5fd7ed096ef04e5d0ba81e8480 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 12:47:46 -0300
Subject: [PATCH 56/77] Fix TextBox drawing when we scroll it

---
 src/ui/theme.cpp | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 3125180f0..b43b7b278 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -80,7 +80,7 @@ Theme* CurrentTheme::get()
 }
 
 void drawTextBox(Graphics* g, Widget* widget,
-  int* w, int* h, gfx::Color bg, gfx::Color fg)
+                 int* w, int* h, gfx::Color bg, gfx::Color fg)
 {
   View* view = View::getView(widget);
   char* text = const_cast<char*>(widget->text().c_str());
@@ -88,31 +88,26 @@ void drawTextBox(Graphics* g, Widget* widget,
   int x1, y1, x2, y2;
   int x, y, chr, len;
   gfx::Point scroll;
-  int viewport_w, viewport_h;
   int textheight = widget->textHeight();
   she::Font* font = widget->font();
   char *beg_end, *old_end;
   int width;
+  gfx::Rect vp;
 
   if (view) {
-    gfx::Rect vp = view->viewportBounds()
-      .offset(-view->viewport()->bounds().origin());
-
-    x1 = vp.x;
-    y1 = vp.y;
-    viewport_w = vp.w;
-    viewport_h = vp.h;
+    vp = view->viewportBounds().offset(-widget->bounds().origin());
     scroll = view->viewScroll();
   }
   else {
-    x1 = widget->clientBounds().x + widget->border().left();
-    y1 = widget->clientBounds().y + widget->border().top();
-    viewport_w = widget->clientBounds().w - widget->border().width();
-    viewport_h = widget->clientBounds().h - widget->border().height();
+    vp = widget->clientBounds();
+    vp.w -= widget->border().width();
+    vp.h -= widget->border().height();
     scroll.x = scroll.y = 0;
   }
-  x2 = x1 + viewport_w;
-  y2 = y1 + viewport_h;
+  x1 = widget->clientBounds().x;
+  y1 = widget->clientBounds().y;
+  x2 = vp.x + vp.w;
+  y2 = vp.y + vp.h;
 
   chr = 0;
 
@@ -127,27 +122,27 @@ void drawTextBox(Graphics* g, Widget* widget,
       *w = 0;
     }
     else {
-      /* TODO modificable option? I don't think so, this is very internal stuff */
+      // TODO modificable option? I don't think so, this is very internal stuff
 #if 0
-      /* shows more information in x-scroll 0 */
-      width = viewport_w;
+      // Shows more information in x-scroll 0
+      width = vp.w;
 #else
-      /* make good use of the complete text-box */
+      // Make good use of the complete text-box
       if (view) {
         gfx::Size maxSize = view->getScrollableSize();
-        width = MAX(viewport_w, maxSize.w);
+        width = MAX(vp.w, maxSize.w);
       }
       else {
-        width = viewport_w;
+        width = vp.w;
       }
 #endif
     }
   }
 
   // Draw line-by-line
-  y = y1 - scroll.y;
+  y = y1;
   for (beg=end=text; end; ) {
-    x = x1 - scroll.x;
+    x = x1;
 
     // Without word-wrap
     if (!(widget->align() & WORDWRAP)) {
@@ -208,7 +203,8 @@ void drawTextBox(Graphics* g, Widget* widget,
         xout = x;
 
       g->drawUIString(beg, fg, bg, gfx::Point(xout, y));
-      g->fillAreaBetweenRects(bg,
+      g->fillAreaBetweenRects(
+        bg,
         gfx::Rect(x1, y, x2 - x1, textheight),
         gfx::Rect(xout, y, len, textheight));
     }

From 0d169fed751b1f69e0fd86accd0dd0461d6be9de Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 13:33:01 -0300
Subject: [PATCH 57/77] Improve ui::drawTextBox() performance

---
 src/ui/theme.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index b43b7b278..650cdccda 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -109,6 +109,10 @@ void drawTextBox(Graphics* g, Widget* widget,
   x2 = vp.x + vp.w;
   y2 = vp.y + vp.h;
 
+  // Fill background
+  if (g)
+    g->fillRect(bg, vp);
+
   chr = 0;
 
   // Without word-wrap
@@ -202,11 +206,7 @@ void drawTextBox(Graphics* g, Widget* widget,
       else                      // Left align
         xout = x;
 
-      g->drawUIString(beg, fg, bg, gfx::Point(xout, y));
-      g->fillAreaBetweenRects(
-        bg,
-        gfx::Rect(x1, y, x2 - x1, textheight),
-        gfx::Rect(xout, y, len, textheight));
+      g->drawUIString(beg, fg, gfx::ColorNone, gfx::Point(xout, y));
     }
 
     if (w)
@@ -225,10 +225,6 @@ void drawTextBox(Graphics* g, Widget* widget,
 
   if (w) *w += widget->border().width();
   if (h) *h += widget->border().height();
-
-  // Fill bottom area
-  if (g && y < y2)
-    g->fillRect(bg, gfx::Rect(x1, y, x2 - x1, y2 - y));
 }
 
 } // namespace ui

From db4e32d8dd540720ad19daf210673ef585a0ce62 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 13:53:42 -0300
Subject: [PATCH 58/77] Fix saving backup data when adding/removing layers

---
 src/app/cmd/add_layer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/cmd/add_layer.cpp b/src/app/cmd/add_layer.cpp
index 385e07d66..bb7dde5f1 100644
--- a/src/app/cmd/add_layer.cpp
+++ b/src/app/cmd/add_layer.cpp
@@ -68,6 +68,7 @@ void AddLayer::addLayer(Layer* folder, Layer* newLayer, Layer* afterThis)
   static_cast<LayerFolder*>(folder)->addLayer(newLayer);
   static_cast<LayerFolder*>(folder)->stackLayer(newLayer, afterThis);
   folder->incrementVersion();
+  folder->sprite()->incrementVersion();
 
   Document* doc = folder->sprite()->document();
   DocumentEvent ev(doc);
@@ -86,6 +87,7 @@ void AddLayer::removeLayer(Layer* folder, Layer* layer)
 
   static_cast<LayerFolder*>(folder)->removeLayer(layer);
   folder->incrementVersion();
+  folder->sprite()->incrementVersion();
 
   doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAfterRemoveLayer, ev);
 

From c06ed1b9933fc4423e1ef485bcaff29987622f92 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 14:01:17 -0300
Subject: [PATCH 59/77] Don't show errors if we cancel the sprite loading
 process

---
 src/app/commands/cmd_open_file.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp
index 26776e8a6..018d01d33 100644
--- a/src/app/commands/cmd_open_file.cpp
+++ b/src/app/commands/cmd_open_file.cpp
@@ -157,7 +157,7 @@ void OpenFileCommand::onExecute(Context* context)
         fop->postLoad();
 
         // Show any error
-        if (fop->hasError())
+        if (fop->hasError() && !fop->isStop())
           console.printf(fop->error().c_str());
 
         Document* document = fop->document();

From 4e3a979b974f14b246889c5c975a343feead75b4 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 14:32:18 -0300
Subject: [PATCH 60/77] Redraw the ToolBar when we switch to a quick tool

---
 src/app/ui/toolbar.cpp | 5 +++++
 src/app/ui/toolbar.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/app/ui/toolbar.cpp b/src/app/ui/toolbar.cpp
index 1f18e566f..43ef8b3ec 100644
--- a/src/app/ui/toolbar.cpp
+++ b/src/app/ui/toolbar.cpp
@@ -727,6 +727,11 @@ Rect ToolBar::ToolStrip::getToolBounds(int index)
               iconsize.w, bounds.h);
 }
 
+void ToolBar::onActiveToolChange(tools::Tool* tool)
+{
+  invalidate();
+}
+
 void ToolBar::onSelectedToolChange(tools::Tool* tool)
 {
   if (tool && m_selectedInGroup[tool->getGroup()] != tool)
diff --git a/src/app/ui/toolbar.h b/src/app/ui/toolbar.h
index 93cc4cf27..cd7eb843a 100644
--- a/src/app/ui/toolbar.h
+++ b/src/app/ui/toolbar.h
@@ -61,6 +61,7 @@ namespace app {
     void onClosePopup();
 
     // ActiveToolObserver impl
+    void onActiveToolChange(tools::Tool* tool) override;
     void onSelectedToolChange(tools::Tool* tool) override;
 
     // What tool is selected for each tool-group

From eacf28b65ad7fb82b2463d01da7876898ab64340 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 22 Nov 2016 18:05:56 -0300
Subject: [PATCH 61/77] Add option to change the first frame number on the
 Timeline (fix #1300)

---
 data/pref.xml                             |  3 +++
 data/widgets/options.xml                  |  4 ++++
 data/widgets/timeline_conf.xml            | 23 ++++++++++++++------
 src/app/commands/cmd_frame_properties.cpp | 11 +++++-----
 src/app/commands/cmd_goto_frame.cpp       | 26 +++++++++++++----------
 src/app/commands/cmd_options.cpp          |  3 +++
 src/app/ui/configure_timeline_popup.cpp   | 10 +++++++++
 src/app/ui/configure_timeline_popup.h     |  1 +
 src/app/ui/editor/standby_state.cpp       |  2 +-
 src/app/ui/status_bar.cpp                 | 20 ++++++++---------
 src/app/ui/timeline.cpp                   | 18 ++++++++++++----
 src/app/ui/timeline.h                     |  1 +
 12 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 2cf5914e9..f8a8c1d32 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -269,6 +269,9 @@
       <option id="color1" type="app::Color" default="app::Color::fromRgb(128, 128, 128)" migrate="Option.CheckedBgColor1" />
       <option id="color2" type="app::Color" default="app::Color::fromRgb(192, 192, 192)" migrate="Option.CheckedBgColor2" />
     </section>
+    <section id="timeline">
+      <option id="first_frame" type="int" default="1" />
+    </section>
     <section id="onionskin">
       <option id="active" type="bool" default="false" migrate="Onionskin.Enabled" />
       <option id="prev_frames" type="int" default="1" migrate="Onionskin.PrevFrames" />
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 75043bd9e..850fac377 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -82,6 +82,10 @@
           <separator text="Timeline" horizontal="true" />
           <check text="Show timeline automatically" id="autotimeline" tooltip="Show the timeline automatically&#10;when a new frame or layer is added." />
           <check text="Rewind on Stop" id="rewind_on_stop" tooltip="The 'Stop' button should rewind the animation&#10;where it was started." />
+	  <hbox>
+	    <label text="Default First Frame:" />
+	    <entry id="first_frame" maxsize="3" />
+	  </hbox>
 	</vbox>
 
         <!-- Cursors -->
diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml
index df995869e..cd45c9631 100644
--- a/data/widgets/timeline_conf.xml
+++ b/data/widgets/timeline_conf.xml
@@ -2,13 +2,24 @@
 <!-- Copyright (C) 2014-2016 by David Capello -->
 <gui>
 <vbox id="timeline_conf">
-  <separator cell_hspan="2" text="Position:" left="true" horizontal="true" />
   <hbox>
-    <buttonset columns="2" id="position">
-      <item text="&amp;Left" />
-      <item text="&amp;Right" />
-      <item text="&amp;Bottom" hspan="2" />
-    </buttonset>
+    <vbox>
+      <separator cell_hspan="2" text="Position:" left="true" horizontal="true" />
+      <hbox>
+	<buttonset columns="2" id="position">
+	  <item text="&amp;Left" />
+	  <item text="&amp;Right" />
+	  <item text="&amp;Bottom" hspan="2" />
+	</buttonset>
+      </hbox>
+    </vbox>
+    <vbox>
+      <separator cell_hspan="2" text="Frame Header:" left="true" horizontal="true" />
+      <hbox>
+	<label text="First Frame:" />
+	<entry id="first_frame" maxsize="3" />
+      </hbox>
+    </vbox>
   </hbox>
 
   <separator cell_hspan="2" text="Onion Skin:" left="true" horizontal="true" />
diff --git a/src/app/commands/cmd_frame_properties.cpp b/src/app/commands/cmd_frame_properties.cpp
index bf1bdc666..20c087eb2 100644
--- a/src/app/commands/cmd_frame_properties.cpp
+++ b/src/app/commands/cmd_frame_properties.cpp
@@ -66,7 +66,7 @@ void FramePropertiesCommand::onLoadParams(const Params& params)
   }
   else {
     m_target = SPECIFIC_FRAME;
-    m_frame = frame_t(base::convert_to<int>(frame)-1);
+    m_frame = frame_t(base::convert_to<int>(frame));
   }
 }
 
@@ -79,10 +79,11 @@ void FramePropertiesCommand::onExecute(Context* context)
 {
   const ContextReader reader(context);
   const Sprite* sprite = reader.sprite();
-
+  auto& docPref = Preferences::instance().document(context->activeDocument());
   app::gen::FrameProperties window;
   frame_t firstFrame = 0;
   frame_t lastFrame = 0;
+  int base = docPref.timeline.firstFrame();
 
   switch (m_target) {
 
@@ -104,14 +105,14 @@ void FramePropertiesCommand::onExecute(Context* context)
     }
 
     case SPECIFIC_FRAME:
-      firstFrame = lastFrame = m_frame;
+      firstFrame = lastFrame = m_frame-base;
       break;
   }
 
   if (firstFrame != lastFrame)
-    window.frame()->setTextf("[%d...%d]", (int)firstFrame+1, (int)lastFrame+1);
+    window.frame()->setTextf("[%d...%d]", (int)firstFrame+base, (int)lastFrame+base);
   else
-    window.frame()->setTextf("%d", (int)firstFrame+1);
+    window.frame()->setTextf("%d", (int)firstFrame+base);
 
   window.frlen()->setTextf("%d", sprite->frameDuration(firstFrame));
 
diff --git a/src/app/commands/cmd_goto_frame.cpp b/src/app/commands/cmd_goto_frame.cpp
index 9c6028fd9..bd1611392 100644
--- a/src/app/commands/cmd_goto_frame.cpp
+++ b/src/app/commands/cmd_goto_frame.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -137,22 +137,27 @@ class GotoFrameCommand : public GotoCommand {
 public:
   GotoFrameCommand() : GotoCommand("GotoFrame",
                                    "Go to Frame")
-                     , m_frame(0) { }
+                     , m_showUI(true) { }
   Command* clone() const override { return new GotoFrameCommand(*this); }
 
 protected:
   void onLoadParams(const Params& params) override {
     std::string frame = params.get("frame");
-    if (!frame.empty()) m_frame = strtol(frame.c_str(), NULL, 10);
-    else m_frame = 0;
+    if (!frame.empty()) {
+      m_frame = strtol(frame.c_str(), nullptr, 10);
+      m_showUI = false;
+    }
+    else
+      m_showUI = true;
   }
 
   frame_t onGetFrame(Editor* editor) override {
-    if (m_frame == 0) {
+    auto& docPref = editor->docPref();
+
+    if (m_showUI) {
       app::gen::GotoFrame window;
-
-      window.frame()->setTextf("%d", editor->frame()+1);
-
+      window.frame()->setTextf(
+        "%d", editor->frame()+docPref.timeline.firstFrame());
       window.openWindowInForeground();
       if (window.closer() != window.ok())
         return editor->frame();
@@ -160,12 +165,11 @@ protected:
       m_frame = window.frame()->textInt();
     }
 
-    return MID(0, m_frame-1, editor->sprite()->lastFrame());
+    return MID(0, m_frame-docPref.timeline.firstFrame(), editor->sprite()->lastFrame());
   }
 
 private:
-  // The frame to go. 0 is "show the UI dialog", another value is the
-  // frame (1 is the first name for the user).
+  bool m_showUI;
   int m_frame;
 };
 
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index b8e98dba6..a3ee62212 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -109,6 +109,8 @@ public:
     if (m_pref.general.rewindOnStop())
       rewindOnStop()->setSelected(true);
 
+    firstFrame()->setTextf("%d", m_globPref.timeline.firstFrame());
+
     if (m_pref.general.expandMenubarOnMouseover())
       expandMenubarOnMouseover()->setSelected(true);
 
@@ -244,6 +246,7 @@ public:
   void saveConfig() {
     m_pref.general.autoshowTimeline(autotimeline()->isSelected());
     m_pref.general.rewindOnStop(rewindOnStop()->isSelected());
+    m_globPref.timeline.firstFrame(firstFrame()->textInt());
     m_pref.general.showFullPath(showFullPath()->isSelected());
 
     bool expandOnMouseover = expandMenubarOnMouseover()->isSelected();
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index 7a9a93ced..a2e492444 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -47,6 +47,7 @@ ConfigureTimelinePopup::ConfigureTimelinePopup()
   addChild(m_box);
 
   m_box->position()->ItemChange.connect(base::Bind<void>(&ConfigureTimelinePopup::onChangePosition, this));
+  m_box->firstFrame()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onChangeFirstFrame, this));
   m_box->merge()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onChangeType, this));
   m_box->tint()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onChangeType, this));
   m_box->opacity()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onOpacity, this));
@@ -82,6 +83,9 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
   }
   m_box->position()->setSelectedItem(selItem, false);
 
+  m_box->firstFrame()->setTextf(
+    "%d", docPref.timeline.firstFrame());
+
   switch (docPref.onionskin.type()) {
     case app::gen::OnionskinType::MERGE:
       m_box->merge()->setSelected(true);
@@ -141,6 +145,12 @@ void ConfigureTimelinePopup::onChangePosition()
   Preferences::instance().general.timelinePosition(newTimelinePos);
 }
 
+void ConfigureTimelinePopup::onChangeFirstFrame()
+{
+  docPref().timeline.firstFrame(
+    m_box->firstFrame()->textInt());
+}
+
 void ConfigureTimelinePopup::onChangeType()
 {
   if (m_lockUpdates)
diff --git a/src/app/ui/configure_timeline_popup.h b/src/app/ui/configure_timeline_popup.h
index 4d41ab588..2987422b0 100644
--- a/src/app/ui/configure_timeline_popup.h
+++ b/src/app/ui/configure_timeline_popup.h
@@ -33,6 +33,7 @@ namespace app {
   protected:
     bool onProcessMessage(ui::Message* msg) override;
     void onChangePosition();
+    void onChangeFirstFrame();
     void onChangeType();
     void onOpacity();
     void onOpacityStep();
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 7ca988399..decfea121 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -487,7 +487,7 @@ bool StandbyState::onUpdateStatusBar(Editor* editor)
     if (sprite->totalFrames() > 1) {
       sprintf(
         buf+std::strlen(buf), " :frame: %d :clock: %d",
-        editor->frame()+1,
+        editor->frame()+editor->docPref().timeline.firstFrame(),
         sprite->frameDuration(editor->frame()));
     }
 
diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index 25cc8437f..b11072957 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -489,13 +489,11 @@ public:
              scancode == kKeyEnterPad)) {
           Command* cmd = CommandsModule::instance()->getCommandByName(CommandId::GotoFrame);
           Params params;
-          int frame = textInt();
-          if (frame > 0) {
-            params.set("frame", text().c_str());
-            UIContext::instance()->executeCommand(cmd, params);
-          }
+          params.set("frame", text().c_str());
+          UIContext::instance()->executeCommand(cmd, params);
+
           // Select the text again
-          selectText(0, -1);
+          selectAllText();
           releaseFocus();
           return true;          // Key used.
         }
@@ -740,13 +738,15 @@ void StatusBar::onActiveSiteChange(const doc::Site& site)
       ASSERT(m_doc == site.document());
     }
 
+    auto& docPref = Preferences::instance().document(
+      static_cast<app::Document*>(m_doc));
+
     m_docControls->setVisible(true);
-    showSnapToGridWarning(
-      Preferences::instance().document(
-        static_cast<app::Document*>(m_doc)).grid.snap());
+    showSnapToGridWarning(docPref.grid.snap());
 
     // Current frame
-    m_currentFrame->setTextf("%d", site.frame()+1);
+    m_currentFrame->setTextf(
+      "%d", site.frame()+docPref.timeline.firstFrame());
   }
   else {
     ASSERT(m_doc == nullptr);
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 52976605a..bb6d3332b 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -38,6 +38,7 @@
 #include "app/ui/workspace.h"
 #include "app/ui_context.h"
 #include "app/util/clipboard.h"
+#include "base/bind.h"
 #include "base/convert_to.h"
 #include "base/memory.h"
 #include "base/scoped_value.h"
@@ -206,6 +207,9 @@ void Timeline::updateUsingEditor(Editor* editor)
   m_hot.part = PART_NOTHING;
   m_clk.part = PART_NOTHING;
 
+  m_firstFrameConn = Preferences::instance().document(m_document)
+    .timeline.firstFrame.AfterChange.connect(base::Bind<void>(&Timeline::invalidate, this));
+
   setFocusStop(true);
   regenerateLayers();
   setViewScroll(viewScroll());
@@ -214,6 +218,8 @@ void Timeline::updateUsingEditor(Editor* editor)
 
 void Timeline::detachDocument()
 {
+  m_firstFrameConn.disconnect();
+
   if (m_document) {
     m_document->remove_observer(this);
     m_document = NULL;
@@ -1357,8 +1363,11 @@ void Timeline::drawHeaderFrame(ui::Graphics* g, frame_t frame)
     return;
 
   // Draw the header for the layers.
-  char buf[256];
-  std::sprintf(buf, "%d", (frame+1)%100); // Draw only the first two digits.
+  char buf[4];
+  std::snprintf(
+    buf, sizeof(buf), "%d",
+    // Draw only the first two digits
+    (docPref().timeline.firstFrame()+frame) % 100);
 
   she::Font* oldFont = g->font();
   g->setFont(skinTheme()->getMiniFont());
@@ -2236,9 +2245,10 @@ void Timeline::updateStatusBar(ui::Message* msg)
 
       case PART_HEADER_FRAME:
         if (validFrame(m_hot.frame)) {
-          sb->setStatusText(0,
+          sb->setStatusText(
+            0,
             ":frame: %d :clock: %d",
-            (int)m_hot.frame+1,
+            (int)m_hot.frame+docPref().timeline.firstFrame(),
             m_sprite->frameDuration(m_hot.frame));
           return;
         }
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index ff4c60ec9..602a3489c 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -278,6 +278,7 @@ namespace app {
     // Configure timeline
     ConfigureTimelinePopup* m_confPopup;
     obs::scoped_connection m_ctxConn;
+    obs::connection m_firstFrameConn;
 
     // Marching ants stuff to show the range in the clipboard.
     // TODO merge this with the marching ants of the sprite editor (ui::Editor)

From abc586a6d4a72dc1cbba7c4b1accb585337cdcb7 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 23 Nov 2016 14:08:34 -0300
Subject: [PATCH 62/77] Fix bug on macOS scrolling frames w/mouse wheel in the
 wrong direction

Sometimes macOS returns us a delta of 0.0, so we should not move through
frames in that case.
---
 .../ui/editor/state_with_wheel_behavior.cpp   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp
index 5fee94fb8..dff24b784 100644
--- a/src/app/ui/editor/state_with_wheel_behavior.cpp
+++ b/src/app/ui/editor/state_with_wheel_behavior.cpp
@@ -113,15 +113,18 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
       }
       break;
 
-    case WHEEL_FRAME:
-      {
-        Command* command = CommandsModule::instance()->getCommandByName
-          ((dz < 0.0) ? CommandId::GotoNextFrame:
-                        CommandId::GotoPreviousFrame);
-        if (command)
-          UIContext::instance()->executeCommand(command);
-      }
+    case WHEEL_FRAME: {
+      Command* command = nullptr;
+
+      if (dz < 0.0)
+        command = CommandsModule::instance()->getCommandByName(CommandId::GotoNextFrame);
+      else if (dz > 0.0)
+        command = CommandsModule::instance()->getCommandByName(CommandId::GotoPreviousFrame);
+
+      if (command)
+        UIContext::instance()->executeCommand(command);
       break;
+    }
 
     case WHEEL_ZOOM: {
       render::Zoom zoom = editor->zoom();

From 489e7da6ec84a8e43c90cdec8cd4a93393af9dd6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 23 Nov 2016 14:09:42 -0300
Subject: [PATCH 63/77] Support smooth scroll in timeline

---
 src/app/ui/timeline.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index bb6d3332b..baec1cbb5 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -872,23 +872,23 @@ bool Timeline::onProcessMessage(Message* msg)
 
     case kMouseWheelMessage:
       if (m_document) {
-        int dz = static_cast<MouseMessage*>(msg)->wheelDelta().y;
-        int dx = 0;
-        int dy = 0;
+        gfx::Point delta = static_cast<MouseMessage*>(msg)->wheelDelta();
+        if (!static_cast<MouseMessage*>(msg)->preciseWheel()) {
+          delta.x *= FRMSIZE;
+          delta.y *= LAYSIZE;
 
-        dx += static_cast<MouseMessage*>(msg)->wheelDelta().x;
+          if (msg->shiftPressed()) {
+            // On macOS shift already changes the wheel axis
+            if (std::fabs(delta.y) > delta.x)
+              std::swap(delta.x, delta.y);
+          }
 
-        if (msg->ctrlPressed())
-          dx = dz * FRMSIZE;
-        else
-          dy = dz * LAYSIZE;
-
-        if (msg->shiftPressed()) {
-          dx *= 3;
-          dy *= 3;
+          if (msg->altPressed()) {
+            delta.x *= 3;
+            delta.y *= 3;
+          }
         }
-
-        setViewScroll(viewScroll() + gfx::Point(dx, dy));
+        setViewScroll(viewScroll() + delta);
       }
       break;
 

From ebec853a5425dc3a5fcb9b6e139ca37f70acd2db Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 16:19:19 -0300
Subject: [PATCH 64/77] Define devconsole only when ENABLE_SCRIPTING is on

---
 src/app/ui/main_window.cpp | 7 ++++++-
 src/app/ui/main_window.h   | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp
index ea0242666..27d9e79a5 100644
--- a/src/app/ui/main_window.cpp
+++ b/src/app/ui/main_window.cpp
@@ -90,8 +90,10 @@ public:
 MainWindow::MainWindow()
   : m_mode(NormalMode)
   , m_homeView(nullptr)
-  , m_devConsoleView(nullptr)
   , m_scalePanic(nullptr)
+#ifdef ENABLE_SCRIPTING
+  , m_devConsoleView(nullptr)
+#endif
 {
   // Load all menus by first time.
   AppMenus::instance()->reload();
@@ -154,11 +156,14 @@ MainWindow::~MainWindow()
 {
   delete m_scalePanic;
 
+#ifdef ENABLE_SCRIPTING
   if (m_devConsoleView) {
     if (m_devConsoleView->parent())
       m_workspace->removeView(m_devConsoleView);
     delete m_devConsoleView;
   }
+#endif
+
   if (m_homeView) {
     if (m_homeView->parent())
       m_workspace->removeView(m_homeView);
diff --git a/src/app/ui/main_window.h b/src/app/ui/main_window.h
index 5a7f8e51c..d7ea5bee7 100644
--- a/src/app/ui/main_window.h
+++ b/src/app/ui/main_window.h
@@ -114,9 +114,11 @@ namespace app {
     Workspace* m_workspace;
     PreviewEditorWindow* m_previewEditor;
     HomeView* m_homeView;
-    DevConsoleView* m_devConsoleView;
     Notifications* m_notifications;
     INotificationDelegate* m_scalePanic;
+#ifdef ENABLE_SCRIPTING
+    DevConsoleView* m_devConsoleView;
+#endif
   };
 
 }

From d49679c3618827cb67cb2a9ea68a1102835c6124 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 16:19:44 -0300
Subject: [PATCH 65/77] Compile cmd_run_script.cpp only when ENABLE_SCRIPTING
 is on

---
 src/app/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 9e5a1308e..fa6387409 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -267,7 +267,6 @@ add_library(app-lib
   commands/cmd_reselect_mask.cpp
   commands/cmd_reverse_frames.cpp
   commands/cmd_rotate.cpp
-  commands/cmd_run_script.cpp
   commands/cmd_save_file.cpp
   commands/cmd_save_mask.cpp
   commands/cmd_save_palette.cpp

From c4ed121efcf6858771a0e89ef7017ef560877df2 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 16:48:37 -0300
Subject: [PATCH 66/77] Add #errors in some header files that need
 ENABLE_SCRIPTING defined

---
 src/app/script/app_scripting.h | 4 ++++
 src/app/shell.h                | 4 ++++
 src/app/ui/devconsole_view.h   | 4 ++++
 src/app/ui/main_window.cpp     | 5 ++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/app/script/app_scripting.h b/src/app/script/app_scripting.h
index 5fcc0e182..396905d3f 100644
--- a/src/app/script/app_scripting.h
+++ b/src/app/script/app_scripting.h
@@ -8,6 +8,10 @@
 #define APP_SCRIPTING_H_INCLUDED
 #pragma once
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "doc/object_id.h"
 #include "script/engine.h"
 
diff --git a/src/app/shell.h b/src/app/shell.h
index c1b1b0823..deddebeb4 100644
--- a/src/app/shell.h
+++ b/src/app/shell.h
@@ -8,6 +8,10 @@
 #define APP_SHELL_H_INCLUDED
 #pragma once
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 namespace script {
   class Engine;
 }
diff --git a/src/app/ui/devconsole_view.h b/src/app/ui/devconsole_view.h
index 974ec44bc..80313b0b2 100644
--- a/src/app/ui/devconsole_view.h
+++ b/src/app/ui/devconsole_view.h
@@ -8,6 +8,10 @@
 #define APP_UI_DEVCONSOLE_VIEW_H_INCLUDED
 #pragma once
 
+#ifndef ENABLE_SCRIPTING
+  #error ENABLE_SCRIPTING must be defined
+#endif
+
 #include "app/script/app_scripting.h"
 #include "app/ui/tabs.h"
 #include "app/ui/workspace_view.h"
diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp
index 27d9e79a5..3a0271699 100644
--- a/src/app/ui/main_window.cpp
+++ b/src/app/ui/main_window.cpp
@@ -19,7 +19,6 @@
 #include "app/pref/preferences.h"
 #include "app/ui/color_bar.h"
 #include "app/ui/context_bar.h"
-#include "app/ui/devconsole_view.h"
 #include "app/ui/document_view.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/editor/editor_view.h"
@@ -43,6 +42,10 @@
 #include "ui/system.h"
 #include "ui/view.h"
 
+#ifdef ENABLE_SCRIPTING
+  #include "app/ui/devconsole_view.h"
+#endif
+
 namespace app {
 
 using namespace ui;

From 366572db1a8368807506d15d968674b9f1a956c2 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 17:39:52 -0300
Subject: [PATCH 67/77] Fix crash when we close Aseprite calling a dtor/free()
 on an invalid pointer

This bug was introduced in 128ba903949129419ab7a87ad0828d9e39aeb1bf
The AppOptions was compiled with a different size in app-lib and main.cpp
---
 src/CMakeLists.txt     | 1 +
 src/app/CMakeLists.txt | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e24e0a5cc..f0e1d0fe1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -102,6 +102,7 @@ add_subdirectory(ui)
 
 if(ENABLE_SCRIPTING)
   add_subdirectory(script)
+  add_definitions(-DENABLE_SCRIPTING)
 endif()
 
 if(ENABLE_UPDATER)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index fa6387409..852b6a170 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -60,10 +60,6 @@ if(WITH_WEBP_SUPPORT)
   add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
 endif()
 
-if(ENABLE_SCRIPTING)
-  add_definitions(-DENABLE_SCRIPTING)
-endif()
-
 ######################################################################
 # app-lib target
 

From 33d6ffb73b05d924d537909f36042fcae9a84e95 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 17:52:54 -0300
Subject: [PATCH 68/77] Avoid unused variable warning

---
 src/app/modules/gui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index fc47b546c..4ae09754d 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -383,9 +383,9 @@ bool CustomizedGuiManager::onProcessMessage(Message* msg)
       break;
 
     case kKeyDownMessage: {
+#ifdef _DEBUG
       auto keymsg = static_cast<KeyMessage*>(msg);
 
-#ifdef _DEBUG
       // Ctrl+Shift+Q generates a crash (useful to test the anticrash feature)
       if (msg->ctrlPressed() &&
           msg->shiftPressed() &&

From 422dcba69b088ee0c81daf345ec3aa1ace6d0b09 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 18:47:51 -0300
Subject: [PATCH 69/77] Fix Cmd+[ shortcut to go back in the file selector on
 macOS

---
 src/app/ui/file_selector.cpp |  4 ++--
 src/she/osx/event_queue.mm   | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index bb8f2c3e1..f379f7a54 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -198,8 +198,8 @@ protected:
         int unicode = keyMsg->unicodeChar();
         bool up = (msg->cmdPressed() && scancode == kKeyUp);
         bool enter = (msg->cmdPressed() && scancode == kKeyDown);
-        bool back = (msg->cmdPressed() && msg->shiftPressed() && unicode == '[');
-        bool forward = (msg->cmdPressed() && msg->shiftPressed() && unicode == ']');
+        bool back = (msg->cmdPressed() && (unicode == '[' || scancode == kKeyOpenbrace));
+        bool forward = (msg->cmdPressed() && (unicode == ']' || scancode == kKeyClosebrace));
 #else
         bool up = (msg->altPressed() && scancode == kKeyUp);
         bool enter = (msg->altPressed() && scancode == kKeyDown);
diff --git a/src/she/osx/event_queue.mm b/src/she/osx/event_queue.mm
index c80ea18da..5759a76d4 100644
--- a/src/she/osx/event_queue.mm
+++ b/src/she/osx/event_queue.mm
@@ -32,12 +32,11 @@ retry:;
                                 inMode:NSDefaultRunLoopMode
                                dequeue:YES];
     if (event) {
-      // Intercept Control+Tab and send it to the main NSView. Without
-      // this, the NSApplication intercepts the key combination and
-      // use it to go to the next key view.
-      if (event.type == NSKeyDown &&
-          event.modifierFlags & NSControlKeyMask &&
-          event.keyCode == kVK_Tab) {
+      // Intercept <Control+Tab>, <Cmd+[>, and other keyboard
+      // combinations, and send them directly to the main
+      // NSView. Without this, the NSApplication intercepts the key
+      // combination and use it to go to the next key view.
+      if (event.type == NSKeyDown) {
         [app.mainWindow.contentView keyDown:event];
       }
       else {

From 9ee081d7c4e8d99632d7c6ca92475622fe141285 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 18:54:59 -0300
Subject: [PATCH 70/77] Minor change in FileSelector::onLocationCloseListBox()

---
 src/app/ui/file_selector.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index f379f7a54..68123e0b1 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -779,12 +779,12 @@ void FileSelector::onLocationCloseListBox()
     }
   }
 
-  if (fileItem != NULL) {
+  if (fileItem) {
     m_fileList->setCurrentFolder(fileItem);
 
     // Refocus the 'fileview' (the focus in that widget is more
     // useful for the user)
-    manager()->setFocus(m_fileList);
+    m_fileList->requestFocus();
   }
 }
 

From 783acfc61adbc48104b9e7dc1a289439072a43f9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 19:01:08 -0300
Subject: [PATCH 71/77] Fix up/down keys to select the file type

Without this patch, pressing up/down key in the file type combobox will
focus the file list and we'll not be able to continue navigating file
types with the keyboard.
---
 src/app/ui/file_list.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/ui/file_list.cpp b/src/app/ui/file_list.cpp
index 27d7a63f4..089d6c40c 100644
--- a/src/app/ui/file_list.cpp
+++ b/src/app/ui/file_list.cpp
@@ -93,8 +93,6 @@ void FileList::setCurrentFolder(IFileItem* folder)
 
   invalidate();
   View::getView(this)->updateView();
-
-  requestFocus();
 }
 
 void FileList::goUp()

From 701170d85e1bd7dfb495de4685bd160bdd992307 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 19:26:21 -0300
Subject: [PATCH 72/77] Fix alt+mnemonic on macOS

---
 src/app/ui/button_set.cpp |  6 ++----
 src/ui/button.cpp         |  3 +--
 src/ui/menu.cpp           | 19 +++++--------------
 src/ui/widget.cpp         | 12 +++++++++++-
 src/ui/widget.h           |  6 +++++-
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/app/ui/button_set.cpp b/src/app/ui/button_set.cpp
index 7ea2ff2bc..906e7914b 100644
--- a/src/app/ui/button_set.cpp
+++ b/src/app/ui/button_set.cpp
@@ -161,10 +161,8 @@ bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
     case ui::kKeyDownMessage:
       if (isEnabled() && hasText()) {
         KeyMessage* keymsg = static_cast<KeyMessage*>(msg);
-        bool mnemonicPressed =
-          (msg->altPressed() &&
-           mnemonicChar() &&
-           mnemonicChar() == tolower(keymsg->unicodeChar()));
+        bool mnemonicPressed = (msg->altPressed() &&
+                                mnemonicCharPressed(keymsg));
 
         if (mnemonicPressed ||
             (hasFocus() && keymsg->scancode() == kKeySpace)) {
diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index b837fcac6..1fe2d9629 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -101,8 +101,7 @@ bool ButtonBase::onProcessMessage(Message* msg)
       if (isEnabled()) {
         bool mnemonicPressed =
           (msg->altPressed() &&
-           mnemonicChar() &&
-           mnemonicChar() == tolower(keymsg->unicodeChar()));
+           mnemonicCharPressed(keymsg));
 
         // For kButtonWidget
         if (m_behaviorType == kButtonWidget) {
diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index 74527d8b9..4a983eada 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -118,7 +118,7 @@ protected:
 static MenuBox* get_base_menubox(Widget* widget);
 static MenuBaseData* get_base(Widget* widget);
 
-static MenuItem* check_for_letter(Menu* menu, int ascii);
+static MenuItem* check_for_letter(Menu* menu, const KeyMessage* keymsg);
 
 static MenuItem* find_nextitem(Menu* menu, MenuItem* menuitem);
 static MenuItem* find_previtem(Menu* menu, MenuItem* menuitem);
@@ -485,17 +485,9 @@ bool MenuBox::onProcessMessage(Message* msg)
         if (((this->type() == kMenuBoxWidget) && (msg->modifiers() == kKeyNoneModifier || // <-- Inside menu-boxes we can use letters without Alt modifier pressed
                                                   msg->modifiers() == kKeyAltModifier)) ||
             ((this->type() == kMenuBarWidget) && (msg->modifiers() == kKeyAltModifier))) {
-          int unicode = static_cast<KeyMessage*>(msg)->unicodeChar();
-          selected = check_for_letter(menu, unicode);
-          if (!selected) {
-            KeyScancode scancode = static_cast<KeyMessage*>(msg)->scancode();
-            if (scancode >= kKeyA && scancode <= kKeyZ)
-              selected = check_for_letter(menu, 'a' + scancode - kKeyA);
-            else if (scancode >= kKey0 && scancode <= kKey9)
-              selected = check_for_letter(menu, '0' + scancode - kKey0);
-          }
+          auto keymsg = static_cast<KeyMessage*>(msg);
 
-          if (selected) {
+          if (check_for_letter(menu, keymsg)) {
             menu->highlightItem(selected, true, true, true);
             return true;
           }
@@ -1194,15 +1186,14 @@ void MenuItem::executeClick()
   Manager::getDefault()->enqueueMessage(msg);
 }
 
-static MenuItem* check_for_letter(Menu* menu, int ascii)
+static MenuItem* check_for_letter(Menu* menu, const KeyMessage* keymsg)
 {
   for (auto child : menu->children()) {
     if (child->type() != kMenuItemWidget)
       continue;
 
     MenuItem* menuitem = static_cast<MenuItem*>(child);
-    int mnemonic = menuitem->mnemonicChar();
-    if (mnemonic > 0 && mnemonic == std::tolower(ascii))
+    if (menuitem->mnemonicCharPressed(keymsg))
       return menuitem;
   }
   return NULL;
diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp
index 311b11cda..f73a1150d 100644
--- a/src/ui/widget.cpp
+++ b/src/ui/widget.cpp
@@ -1275,11 +1275,21 @@ int Widget::mnemonicChar() const
   if (hasText()) {
     for (int c=0; m_text[c]; ++c)
       if ((m_text[c] == '&') && (m_text[c+1] != '&'))
-        return tolower(m_text[c+1]);
+        return std::tolower(m_text[c+1]);
   }
   return 0;
 }
 
+bool Widget::mnemonicCharPressed(const KeyMessage* keyMsg) const
+{
+  int chr = mnemonicChar();
+  return
+    ((chr) &&
+     ((chr == std::tolower(keyMsg->unicodeChar())) ||
+      (chr >= 'a' && chr <= 'z' && keyMsg->scancode() == (kKeyA + chr - 'a')) ||
+      (chr >= '0' && chr <= '9' && keyMsg->scancode() == (kKey0 + chr - '0'))));
+}
+
 bool Widget::onProcessMessage(Message* msg)
 {
   ASSERT(msg != NULL);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 54bb886c4..8a34de578 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -31,14 +31,15 @@ namespace she {
 namespace ui {
 
   class InitThemeEvent;
+  class KeyMessage;
   class LoadLayoutEvent;
   class Manager;
   class Message;
   class MouseMessage;
   class PaintEvent;
-  class SizeHintEvent;
   class ResizeEvent;
   class SaveLayoutEvent;
+  class SizeHintEvent;
   class Theme;
   class Window;
 
@@ -348,6 +349,9 @@ namespace ui {
     // (the underscored character, i.e. the letter after & symbol).
     int mnemonicChar() const;
 
+    // Returns true if the mnemonic character is pressed.
+    bool mnemonicCharPressed(const ui::KeyMessage* keyMsg) const;
+
   protected:
     // ===============================================================
     // MESSAGE PROCESSING

From 74248cf33ca62d0550c968fec2311f56eddb9b46 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 19:26:52 -0300
Subject: [PATCH 73/77] Cmd+mnemonic on macOS now can press a button

---
 src/ui/button.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index 1fe2d9629..6b430e3f0 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -100,7 +100,7 @@ bool ButtonBase::onProcessMessage(Message* msg)
       // If the button is enabled.
       if (isEnabled()) {
         bool mnemonicPressed =
-          (msg->altPressed() &&
+          ((msg->altPressed() || msg->cmdPressed()) &&
            mnemonicCharPressed(keymsg));
 
         // For kButtonWidget

From 60d89b10ed1065de6866f46318062040f4600a7e Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 24 Nov 2016 19:59:34 -0300
Subject: [PATCH 74/77] Fix crash introduced in
 701170d85e1bd7dfb495de4685bd160bdd992307

---
 src/ui/menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index 4a983eada..0cd4f3e81 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -486,8 +486,8 @@ bool MenuBox::onProcessMessage(Message* msg)
                                                   msg->modifiers() == kKeyAltModifier)) ||
             ((this->type() == kMenuBarWidget) && (msg->modifiers() == kKeyAltModifier))) {
           auto keymsg = static_cast<KeyMessage*>(msg);
-
-          if (check_for_letter(menu, keymsg)) {
+          selected = check_for_letter(menu, keymsg);
+          if (selected) {
             menu->highlightItem(selected, true, true, true);
             return true;
           }

From f4683f385d986d2e62974f55425db1a67423847a Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 29 Nov 2016 11:08:09 -0300
Subject: [PATCH 75/77] Minor change in GotoFrameEntry::onProcessMessage

---
 src/app/ui/status_bar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index b11072957..d64ac70c8 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -476,7 +476,7 @@ public:
       case kMouseEnterMessage:
         if (Preferences::instance().statusBar.focusFrameFieldOnMouseover()) {
           requestFocus();
-          selectText(0, -1);
+          selectAllText();
         }
         break;
 

From acdd9c3fed6dbc49bd9dc2bf6c4219932d9b7da3 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 29 Nov 2016 11:08:29 -0300
Subject: [PATCH 76/77] Don't add dead chars if the entry field is full

---
 src/ui/entry.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ui/entry.cpp b/src/ui/entry.cpp
index ce125a91a..f8f2a138a 100644
--- a/src/ui/entry.cpp
+++ b/src/ui/entry.cpp
@@ -324,7 +324,8 @@ bool Entry::onProcessMessage(Message* msg)
 
             // Select dead-key
             if (keymsg->isDeadKey()) {
-              selectText(m_caret-1, m_caret);
+              if (base::from_utf8(text()).size() < m_maxsize)
+                selectText(m_caret-1, m_caret);
             }
             return true;
           }

From 88b0b2161c32cbde46749c0a4189f802945e6264 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 29 Nov 2016 11:09:09 -0300
Subject: [PATCH 77/77] Fix generation of keyboard events with scancode+unicode
 on Windows

---
 src/she/win/event_queue.h |  8 ++++----
 src/she/win/window.h      | 25 ++++---------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/she/win/event_queue.h b/src/she/win/event_queue.h
index 381ce1587..d9fd5978a 100644
--- a/src/she/win/event_queue.h
+++ b/src/she/win/event_queue.h
@@ -38,15 +38,15 @@ public:
 
       if (res) {
         // Avoid transforming WM_KEYDOWN/UP into WM_DEADCHAR/WM_CHAR
-        // messages when m_translateDeadKeys is disabled.
+        // messages. Dead keys are converted manually in the
+        // WM_KEYDOWN processing on our WinWindow<T> class.
         //
         // From MSDN TranslateMessage() documentation:
         //   "WM_KEYDOWN and WM_KEYUP combinations produce a WM_CHAR
         //   or WM_DEADCHAR message."
         // https://msdn.microsoft.com/en-us/library/windows/desktop/ms644955.aspx
-        if ((m_translateDeadKeys) ||
-            (msg.message != WM_KEYDOWN &&
-             msg.message != WM_KEYUP)) {
+        if (msg.message != WM_KEYDOWN &&
+            msg.message != WM_KEYUP) {
           TranslateMessage(&msg);
         }
         DispatchMessage(&msg);
diff --git a/src/she/win/window.h b/src/she/win/window.h
index 5b0810470..07a28aa67 100644
--- a/src/she/win/window.h
+++ b/src/she/win/window.h
@@ -611,13 +611,15 @@ namespace she {
           ev.setUnicodeChar(0);
           ev.setRepeat(MAX(0, (lparam & 0xffff)-1));
 
-          if (!m_translateDeadKeys) {
+          {
             VkToUnicode tu;
             if (tu) {
               tu.toUnicode(vk, scancode);
               if (tu.isDeadKey()) {
+                ev.setDeadKey(true);
                 ev.setUnicodeChar(tu[0]);
-                tu.toUnicode(vk, scancode); // Call again to remove dead-key
+                if (!m_translateDeadKeys)
+                  tu.toUnicode(vk, scancode); // Call again to remove dead-key
               }
               else if (tu.size() > 0) {
                 sendMsg = false;
@@ -650,25 +652,6 @@ namespace she {
           return 0;
         }
 
-        case WM_DEADCHAR: {
-          Event ev;
-          ev.setType(Event::KeyDown);
-          ev.setDeadKey(true);
-          ev.setUnicodeChar(wparam);
-          ev.setRepeat(lparam & 0xffff);
-          queueEvent(ev);
-          return 0;
-        }
-
-        case WM_CHAR: {
-          Event ev;
-          ev.setType(Event::KeyDown);
-          ev.setUnicodeChar(wparam);
-          ev.setRepeat(lparam & 0xffff);
-          queueEvent(ev);
-          return 0;
-        }
-
         case WM_MENUCHAR:
           // Avoid playing a sound when Alt+key is pressed and it's not in a native menu
           return MAKELONG(0, MNC_CLOSE);