The following changes since commit f90ea7ba7c5ae7010ee0ce062207ae42530f57d6:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171012' into staging (2017-10-12 17:06:50 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/ui-20171016-pull-request

for you to fetch changes up to 2ff408de9c080f2fb5a94ebf6a209c6180c64933:

  gtk: fix wrong id between texture and framebuffer (2017-10-16 14:50:54 +0200)

----------------------------------------------------------------
ui: use keycodemapdb for key code mappings, part one (v2)
ui: add qemu-keymap, update reverse keymaps (for qemu -k $map)
ui: fix for vte 0.50
ui: gtk texture fix

----------------------------------------------------------------

Anthoine Bourgeois (1):
  gtk: fix wrong id between texture and framebuffer

Anthony PERARD (1):
  ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

Daniel P. Berrange (6):
  build: automatically handle GIT submodule checkout for dtc
  docker: don't rely on submodules existing in the main checkout
  ui: add keycodemapdb repository as a GIT submodule
  ui: convert common input code to keycodemapdb
  ui: convert key events to QKeyCodes immediately
  ui: don't export qemu_input_event_new_key

Gerd Hoffmann (3):
  tools: add qemu-keymap
  Add pc-bios/keymaps/Makefile
  pc-bios/keymaps: keymaps update

 configure                 |   75 ++-
 Makefile                  |   54 ++-
 include/ui/input.h        |   12 +-
 qemu-keymap.c             |  258 +++++++++++
 ui/gtk-gl-area.c          |    3 +-
 ui/gtk.c                  |    5 +
 ui/input-keymap.c         |  336 +-------------
 ui/input.c                |   24 +-
 .gitignore                |    2 +
 .gitmodules               |    3 +
 MAINTAINERS               |    6 +
 pc-bios/keymaps/Makefile  |   56 +++
 pc-bios/keymaps/ar        |  819 +++++++++++++++++++++++++++++----
 pc-bios/keymaps/bepo      | 1108 +++++++++++++++++++++++++++++++--------------
 pc-bios/keymaps/cz        |  861 ++++++++++++++++++++++++++++++++---
 pc-bios/keymaps/da        |  732 +++++++++++++++++++++++++++++-
 pc-bios/keymaps/de        |  767 ++++++++++++++++++++++++++++++-
 pc-bios/keymaps/de-ch     |  915 ++++++++++++++++++++++++++++++++-----
 pc-bios/keymaps/en-gb     |  724 ++++++++++++++++++++++++++++-
 pc-bios/keymaps/en-us     |  718 ++++++++++++++++++++++++++++-
 pc-bios/keymaps/es        |  744 +++++++++++++++++++++++++++++-
 pc-bios/keymaps/et        |  818 +++++++++++++++++++++++++++++----
 pc-bios/keymaps/fi        |  814 ++++++++++++++++++++++++++++++---
 pc-bios/keymaps/fo        |  881 ++++++++++++++++++++++++++++++++---
 pc-bios/keymaps/fr        |  704 +++++++++++++++++++++++++++-
 pc-bios/keymaps/fr-be     |  724 ++++++++++++++++++++++++++++-
 pc-bios/keymaps/fr-ca     |  804 ++++++++++++++++++++++++++++++--
 pc-bios/keymaps/fr-ch     |  800 ++++++++++++++++++++++++++++++--
 pc-bios/keymaps/hr        |  752 +++++++++++++++++++++++++++++-
 pc-bios/keymaps/hu        |  887 ++++++++++++++++++++++++++++++++----
 pc-bios/keymaps/is        |  802 +++++++++++++++++++++++++++++---
 pc-bios/keymaps/it        |  757 ++++++++++++++++++++++++++++++-
 pc-bios/keymaps/ja        |  792 +++++++++++++++++++++++++++++---
 pc-bios/keymaps/lt        |  844 ++++++++++++++++++++++++++++++++--
 pc-bios/keymaps/lv        |  766 +++++++++++++++++++++++++++++--
 pc-bios/keymaps/mk        |  814 +++++++++++++++++++++++++++++----
 pc-bios/keymaps/nl        |  794 +++++++++++++++++++++++++++++++-
 pc-bios/keymaps/no        |  758 ++++++++++++++++++++++++++++++-
 pc-bios/keymaps/pl        |  789 ++++++++++++++++++++++++++++++--
 pc-bios/keymaps/pt        |  737 +++++++++++++++++++++++++++++-
 pc-bios/keymaps/pt-br     |  775 ++++++++++++++++++++++++++++++-
 pc-bios/keymaps/ru        |  835 ++++++++++++++++++++++++++++++----
 pc-bios/keymaps/th        |  878 +++++++++++++++++++++++++++++------
 pc-bios/keymaps/tr        |  819 ++++++++++++++++++++++++++++++---
 scripts/archive-source.sh |   34 +-
 scripts/git-submodule.sh  |   38 ++
 ui/keycodemapdb           |    1 +
 47 files changed, 24564 insertions(+), 2075 deletions(-)
 create mode 100644 qemu-keymap.c
 create mode 100644 pc-bios/keymaps/Makefile
 create mode 100755 scripts/git-submodule.sh
 create mode 160000 ui/keycodemapdb

-- 
2.9.3

On 16 October 2017 at 14:16, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit f90ea7ba7c5ae7010ee0ce062207ae42530f57d6:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171012' into staging (2017-10-12 17:06:50 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20171016-pull-request
>
> for you to fetch changes up to 2ff408de9c080f2fb5a94ebf6a209c6180c64933:
>
>   gtk: fix wrong id between texture and framebuffer (2017-10-16 14:50:54 +0200)
>
> ----------------------------------------------------------------
> ui: use keycodemapdb for key code mappings, part one (v2)
> ui: add qemu-keymap, update reverse keymaps (for qemu -k $map)
> ui: fix for vte 0.50
> ui: gtk texture fix
>

Applied, thanks.

-- PMM

On 16.10.2017 15:16, Gerd Hoffmann wrote:
> The following changes since commit f90ea7ba7c5ae7010ee0ce062207ae42530f57d6:
> 
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171012' into staging (2017-10-12 17:06:50 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kraxel.org/qemu tags/ui-20171016-pull-request
> 
> for you to fetch changes up to 2ff408de9c080f2fb5a94ebf6a209c6180c64933:
> 
>   gtk: fix wrong id between texture and framebuffer (2017-10-16 14:50:54 +0200)
> 
> ----------------------------------------------------------------
> ui: use keycodemapdb for key code mappings, part one (v2)
> ui: add qemu-keymap, update reverse keymaps (for qemu -k $map)
> ui: fix for vte 0.50
> ui: gtk texture fix

I just noticed that I now get the following warning message when I
change to an older git branch:

warning: unable to rmdir ui/keycodemapdb: Directory not empty

... this is kind of ugly, is there a way to fix this?

 Thomas

  Hi,

> I just noticed that I now get the following warning message when I
> change to an older git branch:
> 
> warning: unable to rmdir ui/keycodemapdb: Directory not empty
> 
> ... this is kind of ugly, is there a way to fix this?

Hmm, no good idea, other than just rebasing the branch to latest
master.  It's one of the issues with submodules.

Related issue shows up if you go back to an older branch after a
firmware update.  git shows the firmware submodule as modified then and
you have to take care that you don't revert the change by accident. 
Which can easily happen with "git commit -a" ...

cheers,
  Gerd

On Thu, Oct 19, 2017 at 09:14:12AM +0200, Gerd Hoffmann wrote:
>   Hi,
> 
> > I just noticed that I now get the following warning message when I
> > change to an older git branch:
> > 
> > warning: unable to rmdir ui/keycodemapdb: Directory not empty
> > 
> > ... this is kind of ugly, is there a way to fix this?
> 
> Hmm, no good idea, other than just rebasing the branch to latest
> master.  It's one of the issues with submodules.
> 
> Related issue shows up if you go back to an older branch after a
> firmware update.  git shows the firmware submodule as modified then and
> you have to take care that you don't revert the change by accident. 
> Which can easily happen with "git commit -a" ...

If you do a 'make' before committing though the configure code will take
care to re-sync submodules, helping to avoid this problem going forward.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Thu, Oct 19, 2017 at 08:50:02AM +0200, Thomas Huth wrote:
> On 16.10.2017 15:16, Gerd Hoffmann wrote:
> > The following changes since commit f90ea7ba7c5ae7010ee0ce062207ae42530f57d6:
> > 
> >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171012' into staging (2017-10-12 17:06:50 +0100)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kraxel.org/qemu tags/ui-20171016-pull-request
> > 
> > for you to fetch changes up to 2ff408de9c080f2fb5a94ebf6a209c6180c64933:
> > 
> >   gtk: fix wrong id between texture and framebuffer (2017-10-16 14:50:54 +0200)
> > 
> > ----------------------------------------------------------------
> > ui: use keycodemapdb for key code mappings, part one (v2)
> > ui: add qemu-keymap, update reverse keymaps (for qemu -k $map)
> > ui: fix for vte 0.50
> > ui: gtk texture fix
> 
> I just noticed that I now get the following warning message when I
> change to an older git branch:
> 
> warning: unable to rmdir ui/keycodemapdb: Directory not empty
> 
> ... this is kind of ugly, is there a way to fix this?

There's no way to automatically clean that up when switching to older
branches. You can do 'git submodule deinit -f ui/keycodemapdb' *before*
switching to the old branch, or just 'git submodule deinit -f --all'.

Having this stable submodule should be completely harmless though as
nothing in the older branch will be using it.  So IMHO just ignore the
warning message - its only ever going to be a very short term problem
for people until they rebase their branches to git master (aside from
those few people working on stable maint branches)

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|