Problem with scroll wheel on Solaris and others

The scroll wheel does not work Solaris 8 or 10 and rdesktop 1.6.0.
The problem is in the logical->physical button mapping.  Since
Solaris doesn't map buttons 4 & 5, rdesktop 1.6.0 can't seem them.
They did work fine with rdesktop 1.5.0.  This problem appears to
exist in some Linux releases as well.

Commenting out line 2193 in xwin.c does allow the scroll wheel to
work (line 2193 is below):

xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];

But this breaks the intent of the code to require that the RDP server
perform the mouse button mapping for, say, left-handed users.  A better
fix appears to be:

xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1] ? 
g_pointer_log_to_phys_map[xevent.xbutton.button - 1] : xevent.xbutton.button;

This uses the physical button if it exists -- otherwise use the logical
button.
-- 
           Jeff Wieland            |         Purdue University
    Network Systems Administrator  |        ITN&S Data Networks
        Voice: (765)496-8234       |        501 Harrison Street
         FAX: (765)494-6620        |   West Lafayette, IN 47907-2025

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/