From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LANFr-0006MW-Pm for qemu-devel@nongnu.org; Wed, 10 Dec 2008 06:29:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LANFq-0006La-LR for qemu-devel@nongnu.org; Wed, 10 Dec 2008 06:29:23 -0500 Received: from [199.232.76.173] (port=33069 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LANFq-0006LO-Dv for qemu-devel@nongnu.org; Wed, 10 Dec 2008 06:29:22 -0500 Received: from mx1.redhat.com ([66.187.233.31]:48964) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LANFp-0005Hd-W0 for qemu-devel@nongnu.org; Wed, 10 Dec 2008 06:29:22 -0500 Date: Wed, 10 Dec 2008 11:28:45 +0000 From: "Daniel P. Berrange" Subject: Re: [Qemu-devel] [PATCH] evdev_keycode_map Message-ID: <20081210112845.GC22446@redhat.com> References: <20081209224235.GA12529@kos.to> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081209224235.GA12529@kos.to> Reply-To: "Daniel P. Berrange" , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Dustin Kirkland On Wed, Dec 10, 2008 at 12:42:35AM +0200, Riku Voipio wrote: > On Wed, Sep 24, 2008 at 06:10:27PM -0500, Dustin Kirkland wrote: > > I'm attaching a patch that we have applied to the qemu implementation > > inside of the kvm package in Ubuntu. > > Anyone know why this patch is still lingering? > > > --- kvm-72+dfsg/qemu/configure 2008-07-27 08:20:10.000000000 -0500 > > +++ kvm-72+dfsg/qemu/configure 2008-09-24 16:04:28.036791147 -0500 > > @@ -1198,9 +1198,9 @@ if test "$sdl1" = "yes" ; then > > echo "#define CONFIG_SDL 1" >> $config_h > > echo "CONFIG_SDL=yes" >> $config_mak > > if test "$target_softmmu" = "no" -o "$static" = "yes"; then > > - echo "SDL_LIBS=$sdl_static_libs" >> $config_mak > > + echo "SDL_LIBS=-lX11 $sdl_static_libs" >> $config_mak > > else > > - echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak > > + echo "SDL_LIBS=-lX11 `$sdl_config --libs`" >> $config_mak > > fi > > These changes make the SDL code dependant on X ? This > would make compiling windows less trivial.. It ought to be possible to just #ifdef out the bit of the code which checks for evdev on non-Linux, and just default to the existing mapping QEMU had. > > +uint8_t _translate_keycode(int keycode) > > { > > - return x_keycode_to_pc_keycode[key]; > > + if (keycode < 9) > > + keycode = 0; > > + else if (keycode < 97) > > + keycode -= 8; /* just an offset */ > > + else if (keycode < 158) { > > + if (check_for_evdev()) > > + keycode = evdev_keycode_to_pc_keycode[keycode - 97]; > > + else > > + keycode = x_keycode_to_pc_keycode[keycode - 97]; > > This is suboptimal, for every keycode translation we have several > rountrips to Xserver and back. Consider someone using a remote X > server. save the result of check_for_evdev() and use it in subsequent > calls. Sub-optimal is an understatement :-) Easiest would be to declare another "static uint8_t *keymap", and at startup check for evdev and initialize this to point to either the PC or evdev key table. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|