Skip to content
GitLab
Commit c7e8595e authored by Jeremy Bicha's avatar Jeremy Bicha
Browse files

Imported Upstream version 1.0-beta5

parent 2f4b9ab3
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore 0 → 100644
View file @ c7e8595e
# CMake
CMakeFiles/
CMakeCache.txt
config.h
install_manifest.txt
CTestTestfile.cmake
freerdp.pc
*.cmake
/**/*.cmake
/**/**/*.cmake
/**/**/**/*.cmake
/**/**/**/**/*.cmake
# Make
Makefile
# Eclipse
*.project
*.cproject
*.settings
# Documentation
docs/api
client/X11/xfreerdp.1
# Mac OS X
.DS_Store
# Windows
*.vcxproj
*.vcxproj.*
*.sdf
*.sln
*.suo
*.opensdf
ipch
Debug
# Binaries
*.a
*.so
*.so.*
*.dylib
cunit/test_freerdp
client/X11/xfreerdp
client/test/freerdp-test
client/DirectFB/dfreerdp
server/test/tfreerdp-server
server/X11/xfreerdp-server
AUTHORS deleted 100644 → 0
View file @ 2f4b9ab3
This is an attempt at a list of people who have made significant
contributions to the code. If you have been unintentionally omitted
please let one of the team members know.
Erik Forsberg <forsberg@cendio.se>
Hugo Trippaers <spark@ision.nl>
Jay Sorg <j@american-data.com>
Jeroen Meijer <jeroen@oldambt7.com>
Mads Kiilerich <mads@kiilerich.com>
Marc-Andre Moreau <marcandre.moreau@gmail.com>
Matt Chapman <matthewc@cse.unsw.edu.au>
Michael Gernoth <michael@gernoth.net>
Michal Mihalik <mmihalik@sme.sk>
Norbert Federa <nob@thinstuff.com>
Otavio Salvador <otavio@ossystems.com.br>
Peter Åstrand <astrand@cendio.se>
Peter Kallden <peter.kallden@ub.oru.se>
Vic Lee <llyzs@163.com>
CMakeLists.txt 0 → 100644
View file @ c7e8595e
# FreeRDP: A Remote Desktop Protocol Client
# FreeRDP cmake build script
#
# Copyright 2011 O.S. Systems Software Ltda.
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required(VERSION 2.6)
project(FreeRDP C)
set(CMAKE_COLOR_MAKEFILE ON)
# Include cmake modules
include(CheckIncludeFiles)
include(CheckLibraryExists)
include(FindPkgConfig)
include(TestBigEndian)
# Include our extra modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
include(AutoVersioning)
include(ConfigOptions)
include(FindOptionalPackage)
include(CheckCCompilerFlag)
include(GNUInstallDirsWrapper)
# Soname versioning - 0.0.0 since it is not being managed yet
set(FREERDP_VERSION_MAJOR "1")
set(FREERDP_VERSION_MINOR "0")
set(FREERDP_VERSION_PATCH "0")
set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}")
set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_PATCH}")
# Default to release build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
# build shared libs
if(NOT BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON)
endif()
# Compiler-specific flags
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
CHECK_C_COMPILER_FLAG (-Wno-unused-result Wno-unused-result)
if(Wno-unused-result)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
endif()
CHECK_C_COMPILER_FLAG (-Wno-unused-but-set-variable Wno-unused-but-set-variable)
if(Wno-unused-but-set-variable)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
endif()
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
endif()
if(WITH_SSE2_TARGET)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
endif()
endif()
if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd /MT")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2 /Ob2")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_X86_")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_UNICODE")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFREERDP_EXPORTS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN")
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
endif()
# Include files
check_include_files(sys/param.h HAVE_SYS_PARAM_H)
check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
check_include_files(netdb.h HAVE_NETDB_H)
check_include_files(fcntl.h HAVE_FCNTL_H)
check_include_files(unistd.h HAVE_UNISTD_H)
check_include_files(limits.h HAVE_LIMITS_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdbool.h HAVE_STDBOOL_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
# Libraries that we have a hard dependency on
find_required_package(OpenSSL)
# Mac OS X
if(APPLE)
include_directories(/opt/local/include)
link_directories(/opt/local/lib)
set(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.4")
endif()
if(NOT WIN32)
find_required_package(ZLIB)
find_optional_package(PulseAudio)
find_optional_package(PCSC)
find_suggested_package(Cups)
find_suggested_package(FFmpeg)
if(NOT APPLE)
find_suggested_package(ALSA)
endif()
endif()
# Endian
test_big_endian(BIG_ENDIAN)
# Path to put keymaps
set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps")
# Path to put plugins
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp")
# Include directories
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)
# Configure files
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
# Generate pkg-config
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
# Build CUnit
find_optional_package(CUnit)
if(CUNIT_FOUND)
enable_testing()
add_subdirectory(cunit)
endif()
# Sub-directories
add_subdirectory(include)
add_subdirectory(libfreerdp-utils)
if(NOT WIN32)
add_subdirectory(libfreerdp-kbd)
endif()
add_subdirectory(libfreerdp-gdi)
add_subdirectory(libfreerdp-rail)
add_subdirectory(libfreerdp-cache)
add_subdirectory(libfreerdp-codec)
add_subdirectory(libfreerdp-channels)
add_subdirectory(libfreerdp-core)
if(NOT WIN32)
add_subdirectory(channels)
endif()
add_subdirectory(client)
add_subdirectory(server)
add_subdirectory(keymaps)
# Source package
set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;/\\\\.gitignore;/CMakeCache.txt")
string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_lower)
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${FREERDP_VERSION_FULL}")
include(CPack)
COPYING deleted 100644 → 0
View file @ 2f4b9ab3
This software is released under the GNU General Public License
(reproduced below) with the additional exemption that compiling,
linking, and/or using OpenSSL together with this software is
allowed.
---
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
675 Mass Ave, Cambridge, MA 02139, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
ChangeLog deleted 100644 → 0
View file @ 2f4b9ab3
2010-11-13 Version 0.8.2
* libfreerdp:
- fix buffer overflow when local timezone doesn't fit in 32 bytes
- Fix data corruption after TLS license package
- free TLS resources to avoid memory leaks
* mcs:
- Fix connecting to VirtualBox with extra channels
* wfreerdp:
- align command line options with xfreerdp
- Fixes for compilation with VS2008
* rdpsnd plugin:
- ensure the ALSA device is closed when freeing resources
* rdpdr plugin:
- fix various memory leaks
- fix a segfault in multi-session environment
2010-10-25 Version 0.8.1
* cunit tests:
- added --with-cunit compile time option (disabled by default)
- cunit tests now included in distribution tarball
* wfreerdp:
- removed unused ASN.1 MCS source files that would affect wfreerdp
- fixed various problems that would prevent wfreerdp from compiling
2010-10-24 Version 0.8.0
* xfreerdp:
- show less debug info unless in debug mode
- more useful keyboard debugging
- new command-line-option: --no-osb: disable off screen bitmaps
- Host-names now appear in window-title
- new command-line-option: --version
* rdpdr plugin:
- some fixes
- parallel port redirection
- serial port redirection
* drdynvc (Dynamic Virtual Channel) plugin:
- started work
- added audin (Redirect audio recording device to the server) subplugin (EXPERIMENTAL)
* Added working TLS encryption support:
- enable TLS by default and added option --no-tls (TLS is currently only available with OpenSSL as crypto backend)
* Crypto restructuring
- added partial support for PolarSSL as crypto backend
- added support for NSS as crypto backend
- added support for GnuTLS as crypto backend
* Fixes for Load Balancing and authentication when redirecting
2010-08-18 Version 0.7.4
* Maintenance:
- Brazilian ABNT keyboard issue
- libfreerdpkbd.c zombies
- manpage fixes
- VirtualBox connectivity
2010-07-23 Version 0.7.3
* Maintenance:
- Add freerdp_ prefix to get_wstr/set_wstr to avoid function name conflict
- Corrected neo keyboard layout id
2010-07-04 Version 0.7.2
* xfreerdp:
- --help as alias for -h
- report invalid options to the user
- assuming no Host-Name can start with "-"
- added German neo layout to list of keyboard layout variants
* Maintenance:
- Fixes in crypto
- Works towards DirectFB
2010-06-19 Version 0.7.1
* xfreerdp:
- added -k option to force particular keyboard layout ID
- added --kbd-list option to list all keyboard layout IDs
- added -h option for help
- changed -plugin and -data argument to --plugin and --data
* Maintenance:
- Fixes to build system
2010-06-11 Version 0.7.0
* Software Architecture:
- Full multi-session support
- Created a library separate from the UI, making it easier to implement different UI's
- New keyboard input system based on the XKB database, providing better support for international keyboards
- Implemented Microsoft's virtual channel plugin API and re-implemented features as plugins (libfreerdpchanman)
- Created a "device manager" for various devices redirected over the device redirection plugin
* Refactoring:
- X11 UI completely rewritten from scratch
- Disk and printer redirection have been rewritten in a much cleaner way
- redirection has been re-implemented as a virtual channel plugin
- Sound redirection has also been re-implemented as a virtual channel plugin
- A *LOT* of added comments in the code with regards to the protocol documentation
- Cleanup and increased compliance with the documentation released by MS after rdesktop was created
* Improvements:
- Support for cursors on Windows Server 2008 R2
- Support for bitmap caching, which provides a good performance boost
- Build system has been completely revamped to use newer tools such as libtool
- Support for Windows Server 2008 Terminal Services Session Broker Load Balancing
- It is now possible to compile FreeRDP without OpenSSL, using built-in code (more lightweight on embedded systems but only partially supported)
- Real capability set processing (original implementation discarded capability sets almost entirely and sent blobs)
* Work In Progress:
- A DirectFB UI has been started
- New Win32 port with working native UI, but it's not complete yet
- Support for NSS as a replacement for OpenSSL is also being worked on
- Network Level Authentication is half-way done (TLS works, but NTLM authentication is partially implemented)
* Dropped or Broken Features:
- seamlessrdp is *NOT* supported. RemoteApp support is eventually going to replace seamlessrdp
- Serial port redirection is currently not supported, as it needs to be re-implemented as a plugin
- Smartcard support also needs to be re-implemented as a plugin
LICENSE 0 → 100644
View file @ c7e8595e
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Makefile.am deleted 100644 → 0
View file @ 2f4b9ab3
## Process this file with automake to produce Makefile.in
REQUIRED_SUBDIRS = \
asn1 \
libfreerdp \
doc \
contrib \
include \
libfreerdpkbd \
keymaps \
libfreerdpgdi \
libfreerdpchanman \
channels/common \
channels/rdpsnd \
channels/drdynvc \
channels/drdynvc/pnpdr \
channels/drdynvc/audin \
channels/cliprdr \
channels/rdpdr \
channels/rdpdr/disk \
channels/rdpdr/printer \
channels/rdpdr/serial \
channels/rdpdr/parallel
OPTIONAL_SUBDIRS = \
cunit \
X11 \
win \
dfb
SUBDIRS = $(REQUIRED_SUBDIRS) $(EXTRA_SUBDIRS)
DIST_SUBDIRS = $(REQUIRED_SUBDIRS) $(OPTIONAL_SUBDIRS)
EXTRA_DIST = autogen.sh build-aux indent-all.sh freerdp.spec \
AUTHORS ChangeLog COPYING INSTALL NEWS README
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = freerdp.pc
## Support version extraction from GIT tree
BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
Makefile.in deleted 100644 → 0
View file @ 2f4b9ab3
This diff is collapsed.
README
View file @ c7e8595e
==========================================
FreeRDP: an Updated Remote Desktop Client
==========================================
FreeRDP is a successor to rdesktop, a longtime-favored application for use
on *nix systems to access Windows servers and workstations. The goal of
FreeRDP is twofold: a more complete support of keyboard layouts; and support
of newer Remote Desktop Protocol (RDP) features found in the Windows 6.0
(Vista/2008) & 6.1 (7/2008R2) environments.
Support
--------------------
* Homepage: http://freerdp.com/
* Development: http://sourceforge.net/projects/freerdp/
Libraries used (Ubuntu package names - may not apply to all environments)
--------------------------------------------------
* Xorg-dev
* libssl-dev (OpenSSL)
* libcups2-dev (CUPS 1.3/1.4)
* libasound2-dev (ALSA)
Using git-master source
-----------------------
1. Install autogen, automake, and gettext.
2. "git clone git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp"
3. "cd freerdp"
4. "sh autogen.sh"
Compiling & installing (git-master or release)
----------------------------------------------
1. As a root-capable user, install what libraries you require.
2a. Stable users: download the latest release archive.
2b. Edge users: follow the git-master source procedure.
3. "./configure"
4. "make"
5. As a root-capable user, "make install"
The default is to install under /usr/local. This can be changed by adding
--prefix=directory to the configure line.
Using FreeRDP
-------------
* Running xfreerdp (or relative binary) by itself will display help.
* Note that the server name must be the last option
* xfreerdp plugins expand features available by the software. They are
installed in (install)/lib/freerdp/ .
Examples of using xfreerdp
---------------------------
* Remote clipboard access
xfreerdp --plugin cliprdr -g 900x600 (server)
* Comport redirection & clipboard access
xfreerdp --plugin cliprdr --plugin rdpdr --data serial:COM1:/dev/ttyUSB0 -- -g 900x600 (server)
FreeRDP: A Remote Desktop Protocol Client
=========================================
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications.
Resources
---------
Website: http://www.freerdp.com/
Wiki: http://www.freerdp.com/wiki/
Sources: http://www.freerdp.com/git/
API doc: http://www.freerdp.com/api/
IRC channel: #freerdp @ irc.freenode.net
Mailing list: https://lists.sourceforge.net/lists/listinfo/freerdp-devel
Microsoft Open Specifications
-----------------------------
Information regarding the Microsoft Open Specifications can be found at:
http://www.microsoft.com/openspecifications/
Compilation
-----------
Instructions on how to get started compiling FreeRDP can be found on the wiki:
http://www.freerdp.com/wiki/doku.php?id=compilation
X11/Makefile.am deleted 100644 → 0
View file @ 2f4b9ab3
## Process this file with automake to produce Makefile.in
# rdesktop
bin_PROGRAMS = xfreerdp
xfreerdp_SOURCES = \
xf_color.c xf_color.h \
xf_event.c xf_event.h \
xf_keyboard.c xf_keyboard.h \
xf_types.h \
xf_win.h xf_win.c \
xfreerdp.c
xfreerdp_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include @XCURSOR_CFLAGS@ @X_CFLAGS@
xfreerdp_LDADD = \
../libfreerdp/libfreerdp.la \
../libfreerdpkbd/libfreerdpkbd.la \
../libfreerdpchanman/libfreerdpchanman.la \
@XCURSOR_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ \
-lpthread
X11/Makefile.in deleted 100644 → 0
View file @ 2f4b9ab3
This diff is collapsed.
X11/xf_color.c deleted 100644 → 0
View file @ 2f4b9ab3
/*
Copyright (c) 2009-2010 Jay Sorg
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
/*
Valid color conversions
8 -> 32 8 -> 24 8 -> 16 8 -> 15
15 -> 32 15 -> 24 15 -> 16 15 -> 15
16 -> 32 16 -> 24 16 -> 16
24 -> 32 24 -> 24
32 -> 32
*/
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "xf_types.h"
#define SPLIT32BGR(_alpha, _red, _green, _blue, _pixel) \
_red = _pixel & 0xff; \
_green = (_pixel & 0xff00) >> 8; \
_blue = (_pixel & 0xff0000) >> 16; \
_alpha = (_pixel & 0xff000000) >> 24;
#define SPLIT24BGR(_red, _green, _blue, _pixel) \
_red = _pixel & 0xff; \
_green = (_pixel & 0xff00) >> 8; \
_blue = (_pixel & 0xff0000) >> 16;
#define SPLIT24RGB(_red, _green, _blue, _pixel) \
_blue = _pixel & 0xff; \
_green = (_pixel & 0xff00) >> 8; \
_red = (_pixel & 0xff0000) >> 16;
#define SPLIT16RGB(_red, _green, _blue, _pixel) \
_red = ((_pixel >> 8) & 0xf8) | ((_pixel >> 13) & 0x7); \
_green = ((_pixel >> 3) & 0xfc) | ((_pixel >> 9) & 0x3); \
_blue = ((_pixel << 3) & 0xf8) | ((_pixel >> 2) & 0x7);
#define SPLIT15RGB(_red, _green, _blue, _pixel) \
_red = ((_pixel >> 7) & 0xf8) | ((_pixel >> 12) & 0x7); \
_green = ((_pixel >> 2) & 0xf8) | ((_pixel >> 8) & 0x7); \
_blue = ((_pixel << 3) & 0xf8) | ((_pixel >> 2) & 0x7);
#define MAKE32RGB(_alpha, _red, _green, _blue) \
(_alpha << 24) | (_red << 16) | (_green << 8) | _blue;
#define MAKE24RGB(_red, _green, _blue) \
(_red << 16) | (_green << 8) | _blue;
#define MAKE15RGB(_red, _green, _blue) \
(((_red & 0xff) >> 3) << 10) | \
(((_green & 0xff) >> 3) << 5) | \
(((_blue & 0xff) >> 3) << 0)
#define MAKE16RGB(_red, _green, _blue) \
(((_red & 0xff) >> 3) << 11) | \
(((_green & 0xff) >> 2) << 5) | \
(((_blue & 0xff) >> 3) << 0)
static int
get_pixel(uint8 * data, int x, int y, int width, int height, int bpp)
{
int start;
int shift;
int red;
int green;
int blue;
uint16 * s16;
uint32 * s32;
switch (bpp)
{
case 1:
width = (width + 7) / 8;
start = (y * width) + x / 8;
shift = x % 8;
return (data[start] & (0x80 >> shift)) != 0;
case 8:
return data[y * width + x];
case 15:
case 16:
s16 = (uint16 *) data;
return s16[y * width + x];
case 24:
data += y * width * 3;
data += x * 3;
red = data[0];
green = data[1];
blue = data[2];
return MAKE24RGB(red, green, blue);
case 32:
s32 = (uint32 *) data;
return s32[y * width + x];
default:
printf("unknonw in get_pixel\n");
break;
}
return 0;
}
static void
set_pixel(uint8 * data, int x, int y, int width, int height, int bpp, int pixel)
{
int start;
int shift;
int * d32;
if (bpp == 1)
{
width = (width + 7) / 8;
start = (y * width) + x / 8;
shift = x % 8;
if (pixel)
{
data[start] = data[start] | (0x80 >> shift);
}
else
{
data[start] = data[start] & ~(0x80 >> shift);
}
}
else if (bpp == 32)
{
d32 = (int *) data;
d32[y * width + x] = pixel;
}
else
{
printf("unknonw in set_pixel\n");
}
}
static int
xf_color(xfInfo * xfi, int in_color, int in_bpp, int out_bpp)
{
int alpha;
int red;
int green;
int blue;
int rv;
alpha = 0xff;
red = 0;
green = 0;
blue = 0;
rv = 0;
switch (in_bpp)
{
case 32:
SPLIT32BGR(alpha, red, green, blue, in_color);
break;
case 24:
SPLIT24BGR(red, green, blue, in_color);
break;
case 16:
SPLIT16RGB(red, green, blue, in_color);
break;
case 15:
SPLIT15RGB(red, green, blue, in_color);
break;
case 8:
in_color &= 0xff;
SPLIT24RGB(red, green, blue, xfi->colormap[in_color]);
break;
case 1:
if (in_color != 0)
{
red = 0xff;
green = 0xff;
blue = 0xff;
}
break;
default:
printf("xf_color: bad in_bpp %d\n", in_bpp);
break;
}
switch (out_bpp)
{
case 32:
rv = MAKE32RGB(alpha, red, green, blue);
break;
case 24:
rv = MAKE24RGB(red, green, blue);
break;
case 16:
rv = MAKE16RGB(red, green, blue);
break;
case 15:
rv = MAKE15RGB(red, green, blue);
break;
case 1:
if ((red != 0) || (green != 0) || (blue != 0))
{
rv = 1;
}
break;
default:
printf("xf_color: bad out_bpp %d\n", out_bpp);
break;
}
return rv;
}
int
xf_color_convert(xfInfo * xfi, rdpSet * settings, int color)
{
return xf_color(xfi, color, settings->server_depth, xfi->bpp);
}
uint8 *
xf_image_convert(xfInfo * xfi, rdpSet * settings, int width, int height,
uint8 * in_data)
{
int red;
int green;
int blue;
int index;
int pixel;
uint8 * out_data;
uint8 * src8;
uint8 * dst8;
if ((settings->server_depth == 24) && (xfi->bpp == 32))
{
out_data = (uint8 *) malloc(width * height * 4);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
blue = *(src8++);
green = *(src8++);
red = *(src8++);
pixel = MAKE24RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
*dst8++ = (pixel >> 16) & 0xff;
*dst8++ = (pixel >> 24) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 16) && (xfi->bpp == 32))
{
out_data = (uint8 *) malloc(width * height * 4);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8++;
pixel |= (*src8++) << 8;
SPLIT16RGB(red, green, blue, pixel);
pixel = MAKE24RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
*dst8++ = (pixel >> 16) & 0xff;
*dst8++ = (pixel >> 24) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 15) && (xfi->bpp == 32))
{
out_data = (uint8 *) malloc(width * height * 4);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8++;
pixel |= (*src8++) << 8;
SPLIT15RGB(red, green, blue, pixel);
pixel = MAKE24RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
*dst8++ = (pixel >> 16) & 0xff;
*dst8++ = (pixel >> 24) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 8) && (xfi->bpp == 32))
{
out_data = (uint8 *) malloc(width * height * 4);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8;
src8++;
pixel = xfi->colormap[pixel];
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
*dst8++ = (pixel >> 16) & 0xff;
*dst8++ = (pixel >> 24) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 15) && (xfi->bpp == 16))
{
out_data = (uint8 *) malloc(width * height * 2);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8++;
pixel |= (*src8++) << 8;
SPLIT15RGB(red, green, blue, pixel);
pixel = MAKE16RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 8) && (xfi->bpp == 16))
{
out_data = (uint8 *) malloc(width * height * 2);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8;
src8++;
pixel = xfi->colormap[pixel];
SPLIT24RGB(red, green, blue, pixel);
pixel = MAKE16RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
}
return out_data;
}
else if ((settings->server_depth == 8) && (xfi->bpp == 15))
{
out_data = (uint8 *) malloc(width * height * 2);
src8 = in_data;
dst8 = out_data;
for (index = width * height; index > 0; index--)
{
pixel = *src8;
src8++;
pixel = xfi->colormap[pixel];
SPLIT24RGB(red, green, blue, pixel);
pixel = MAKE15RGB(red, green, blue);
*dst8++ = pixel & 0xff;
*dst8++ = (pixel >> 8) & 0xff;
}
return out_data;
}
return in_data;
}
RD_HPALETTE
xf_create_colormap(xfInfo * xfi, rdpSet * settings, RD_PALETTE * colors)
{
int * colormap;
int index;
int red;
int green;
int blue;
int count;
colormap = (int *) malloc(sizeof(int) * 256);
memset(colormap, 0, sizeof(int) * 256);
count = colors->ncolors;
if (count > 256)
{
count = 256;
}
for (index = count - 1; index >= 0; index--)
{
red = colors->colors[index].red;
green = colors->colors[index].green;
blue = colors->colors[index].blue;
colormap[index] = MAKE24RGB(red, green, blue);
}
return (RD_HPALETTE) colormap;
}
int
xf_set_colormap(xfInfo * xfi, rdpSet * settings, RD_HPALETTE map)
{
if (xfi->colormap != NULL)
{
free(xfi->colormap);
}
xfi->colormap = (int *) map;
return 0;
}
/* create mono cursor */
int
xf_cursor_convert_mono(xfInfo * xfi, uint8 * src_data, uint8 * msk_data,
uint8 * xormask, uint8 * andmask, int width, int height, int bpp)
{
int i;
int j;
int jj;
int xpixel;
int apixel;
for (j = 0; j < height; j++)
{
jj = (bpp == 1) ? j : (height - 1) - j;
for (i = 0; i < width; i++)
{
xpixel = get_pixel(xormask, i, jj, width, height, bpp);
xpixel = xf_color(xfi, xpixel, bpp, 24);
apixel = get_pixel(andmask, i, jj, width, height, 1);
if ((xpixel == 0xffffff) && (apixel != 0))
{
/* use pattern(not solid black) for xor area */
xpixel = (i & 1) == (j & 1);
apixel = 1;
}
else
{
xpixel = xpixel != 0;
apixel = apixel == 0;
}
set_pixel(src_data, i, j, width, height, 1, xpixel);
set_pixel(msk_data, i, j, width, height, 1, apixel);
}
}
return 0;
}
/* create 32 bpp cursor */
int
xf_cursor_convert_alpha(xfInfo * xfi, uint8 * alpha_data,
uint8 * xormask, uint8 * andmask, int width, int height, int bpp)
{
int i;
int j;
int jj;
int xpixel;
int apixel;
for (j = 0; j < height; j++)
{
jj = (bpp == 1) ? j : (height - 1) - j;
for (i = 0; i < width; i++)
{
xpixel = get_pixel(xormask, i, jj, width, height, bpp);
xpixel = xf_color(xfi, xpixel, bpp, 32);
apixel = get_pixel(andmask, i, jj, width, height, 1);
if (apixel != 0)
{
if ((xpixel & 0xffffff) == 0xffffff)
{
/* use pattern(not solid black) for xor area */
xpixel = (i & 1) == (j & 1);
xpixel = xpixel ? 0xffffff : 0;
xpixel |= 0xff000000;
}
else if (xpixel == 0xff000000)
{
xpixel = 0;
}
}
set_pixel(alpha_data, i, j, width, height, 32, xpixel);
}
}
return 0;
}
X11/xf_color.h deleted 100644 → 0
View file @ 2f4b9ab3
/*
Copyright (c) 2009-2010 Jay Sorg
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#ifndef __XF_COLOR_H
#define __XF_COLOR_H
#include <freerdp/freerdp.h>
int
xf_color_convert(xfInfo * xfi, rdpSet * settings, int color);
uint8 *
xf_image_convert(xfInfo * xfi, rdpSet * settings, int width, int height,
uint8 * in_data);
RD_HPALETTE
xf_create_colormap(xfInfo * xfi, rdpSet * settings, RD_PALETTE * colors);
int
xf_set_colormap(xfInfo * xfi, rdpSet * settings, RD_HPALETTE map);
int
xf_cursor_convert_mono(xfInfo * xfi, uint8 * src_glyph, uint8 * msk_glyph,
uint8 * xormask, uint8 * andmask, int width, int height, int bpp);
int
xf_cursor_convert_alpha(xfInfo * xfi, uint8 * alpha_data,
uint8 * xormask, uint8 * andmask, int width, int height, int bpp);
#endif
X11/xf_event.c deleted 100644 → 0
View file @ 2f4b9ab3
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/freerdp.h>
#include "xf_types.h"
#include "xf_event.h"
#include "xf_keyboard.h"
static int
xf_handle_event_Expose(xfInfo * xfi, XEvent * xevent)
{
int x;
int y;
int cx;
int cy;
if (xevent->xexpose.window == xfi->wnd)
{
x = xevent->xexpose.x;
y = xevent->xexpose.y;
cx = xevent->xexpose.width;
cy = xevent->xexpose.height;
XCopyArea(xfi->display, xfi->backstore, xfi->wnd, xfi->gc_default,
x, y, cx, cy, x, y);
}
return 0;
}
static int
xf_handle_event_VisibilityNotify(xfInfo * xfi, XEvent * xevent)
{
if (xevent->xvisibility.window == xfi->wnd)
{
xfi->unobscured = xevent->xvisibility.state == VisibilityUnobscured;
}
return 0;
}
static int
xf_handle_event_MotionNotify(xfInfo * xfi, XEvent * xevent)
{
int x;
int y;
if (xevent->xmotion.window == xfi->wnd)
{
x = xevent->xmotion.x;
y = xevent->xmotion.y;
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_MOUSE, PTRFLAGS_MOVE, x, y);
}
if (xfi->fullscreen)
XSetInputFocus(xfi->display, xfi->wnd, RevertToPointerRoot, CurrentTime);
return 0;
}
static int
xf_handle_event_ButtonPress(xfInfo * xfi, XEvent * xevent)
{
int device_flags;
int param1;
int param2;
if (xevent->xbutton.window == xfi->wnd)
{
device_flags = 0;
param1 = 0;
param2 = 0;
switch (xevent->xbutton.button)
{
case 1:
device_flags = PTRFLAGS_DOWN | PTRFLAGS_BUTTON1;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
case 2:
device_flags = PTRFLAGS_DOWN | PTRFLAGS_BUTTON3;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
case 3:
device_flags = PTRFLAGS_DOWN | PTRFLAGS_BUTTON2;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
case 4:
device_flags = PTRFLAGS_WHEEL | 0x0078;
break;
case 5:
device_flags = PTRFLAGS_WHEEL | PTRFLAGS_WHEEL_NEGATIVE | 0x0088;
break;
}
if (device_flags != 0)
{
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_MOUSE, device_flags,
param1, param2);
}
}
return 0;
}
static int
xf_handle_event_ButtonRelease(xfInfo * xfi, XEvent * xevent)
{
int device_flags;
int param1;
int param2;
if (xevent->xbutton.window == xfi->wnd)
{
device_flags = 0;
param1 = 0;
param2 = 0;
switch (xevent->xbutton.button)
{
case 1:
device_flags = PTRFLAGS_BUTTON1;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
case 2:
device_flags = PTRFLAGS_BUTTON3;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
case 3:
device_flags = PTRFLAGS_BUTTON2;
param1 = xevent->xbutton.x;
param2 = xevent->xbutton.y;
break;
}
if (device_flags != 0)
{
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_MOUSE, device_flags,
param1, param2);
}
}
return 0;
}
static int
xf_handle_event_KeyPress(xfInfo * xfi, XEvent * xevent)
{
KeySym keysym;
char str[256];
XLookupString((XKeyEvent *) xevent, str, sizeof(str), &keysym, NULL);
xf_kb_set_keypress(xevent->xkey.keycode, keysym);
if (xfi->fs_toggle && xf_kb_handle_special_keys(xfi, keysym))
return 0;
xf_kb_send_key(xfi, RDP_KEYPRESS, xevent->xkey.keycode);
return 0;
}
static RD_BOOL
xf_skip_key_release(xfInfo * xfi, XEvent * xevent)
{
XEvent next_event;
if (XPending(xfi->display))
{
memset(&next_event, 0, sizeof(next_event));
XPeekEvent(xfi->display, &next_event);
if (next_event.type == KeyPress)
{
if (next_event.xkey.keycode == xevent->xkey.keycode)
{
return True;
}
}
}
return False;
}
static int
xf_handle_event_KeyRelease(xfInfo * xfi, XEvent * xevent)
{
if (xf_skip_key_release(xfi, xevent))
{
return 0;
}
xf_kb_unset_keypress(xevent->xkey.keycode);
xf_kb_send_key(xfi, RDP_KEYRELEASE, xevent->xkey.keycode);
return 0;
}
static int
xf_handle_event_FocusIn(xfInfo * xfi, XEvent * xevent)
{
if (xevent->xfocus.mode == NotifyGrab)
return 0;
xfi->focused = True;
if (xfi->mouse_into)
XGrabKeyboard(xfi->display, xfi->wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime);
xf_kb_focus_in(xfi);
return 0;
}
static int
xf_handle_event_FocusOut(xfInfo * xfi, XEvent * xevent)
{
if (xevent->xfocus.mode == NotifyUngrab)
return 0;
xfi->focused = False;
if (xevent->xfocus.mode == NotifyWhileGrabbed)
XUngrabKeyboard(xfi->display, CurrentTime);
return 0;
}
static int
xf_handle_event_MappingNotify(xfInfo * xfi, XEvent * xevent)
{
if (xevent->xmapping.request == MappingModifier)
{
XFreeModifiermap(xfi->mod_map);
xfi->mod_map = XGetModifierMapping(xfi->display);
}
return 0;
}
static int
xf_handle_event_ClientMessage(xfInfo * xfi, XEvent * xevent)
{
Atom protocol_atom = XInternAtom(xfi->display, "WM_PROTOCOLS", True);
Atom kill_atom = XInternAtom(xfi->display, "WM_DELETE_WINDOW", True);
if ((xevent->xclient.message_type == protocol_atom)
&& ((Atom) xevent->xclient.data.l[0] == kill_atom))
{
printf("xf_handle_event: ClientMessage user quit received\n");
return 1;
}
return 0;
}
static int
xf_handle_event_EnterNotify(xfInfo * xfi, XEvent * xevent)
{
xfi->mouse_into = True;
if (xfi->fullscreen)
XSetInputFocus(xfi->display, xfi->wnd, RevertToPointerRoot, CurrentTime);
if (xfi->focused)
XGrabKeyboard(xfi->display, xfi->wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime);
return 0;
}
static int
xf_handle_event_LeaveNotify(xfInfo * xfi, XEvent * xevent)
{
xfi->mouse_into = False;
XUngrabKeyboard(xfi->display, CurrentTime);
return 0;
}
int
xf_handle_event(xfInfo * xfi, XEvent * xevent)
{
int rv;
rv = 0;
switch (xevent->type)
{
case Expose:
rv = xf_handle_event_Expose(xfi, xevent);
break;
case VisibilityNotify:
rv = xf_handle_event_VisibilityNotify(xfi, xevent);
break;
case MotionNotify:
rv = xf_handle_event_MotionNotify(xfi, xevent);
break;
case ButtonPress:
rv = xf_handle_event_ButtonPress(xfi, xevent);
break;
case ButtonRelease:
rv = xf_handle_event_ButtonRelease(xfi, xevent);
break;
case KeyPress:
rv = xf_handle_event_KeyPress(xfi, xevent);
break;
case KeyRelease:
rv = xf_handle_event_KeyRelease(xfi, xevent);
break;
case FocusIn:
rv = xf_handle_event_FocusIn(xfi, xevent);
break;
case FocusOut:
rv = xf_handle_event_FocusOut(xfi, xevent);
break;
case EnterNotify:
rv = xf_handle_event_EnterNotify(xfi, xevent);
break;
case LeaveNotify:
rv = xf_handle_event_LeaveNotify(xfi, xevent);
break;
case NoExpose:
DEBUG("xf_handle_event: NoExpose\n");
break;
case GraphicsExpose:
DEBUG("xf_handle_event: GraphicsExpose\n");
break;
case ConfigureNotify:
DEBUG("xf_handle_event: ConfigureNotify\n");
break;
case MapNotify:
DEBUG("xf_handle_event: MapNotify\n");
break;
case ReparentNotify:
DEBUG("xf_handle_event: ReparentNotify\n");
break;
case MappingNotify:
rv = xf_handle_event_MappingNotify(xfi, xevent);
break;
case ClientMessage:
/* the window manager told us to quit */
rv = xf_handle_event_ClientMessage(xfi, xevent);
break;
default:
printf("xf_handle_event unknown event %d\n", xevent->type);
break;
}
return rv;
}
X11/xf_event.h deleted 100644 → 0
View file @ 2f4b9ab3
/*
Copyright (c) 2009-2010 Jay Sorg
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#ifndef __XF_EVENT_H
#define __XF_EVENT_H
int
xf_handle_event(xfInfo * xfi, XEvent * xevent);
#endif
X11/xf_keyboard.c deleted 100644 → 0
View file @ 2f4b9ab3
/*
Copyright (c) 2009-2010 Jay Sorg
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
#include <freerdp/freerdp.h>
#include <freerdp/kbd.h>
#include "xf_types.h"
#include "xf_win.h"
#include "xf_keyboard.h"
static int xf_kb_keyboard_layout = 0;
static RD_BOOL pressed_keys[256] = { False };
void
xf_kb_init(unsigned int keyboard_layout_id)
{
xf_kb_keyboard_layout = freerdp_kbd_init(keyboard_layout_id);
printf("freerdp_kbd_init: %X\n", xf_kb_keyboard_layout);
}
void
xf_kb_inst_init(xfInfo * xfi)
{
xfi->inst->settings->keyboard_layout = xf_kb_keyboard_layout;
};
void
xf_kb_send_key(xfInfo * xfi, int flags, uint8 keycode)
{
int scancode;
if (keycode == xfi->pause_key)
{
/* This is a special key the actually sends two scancodes to the
server. It looks like Control - NumLock but with special flags. */
//printf("special VK_PAUSE\n");
if (flags & KBD_FLAG_UP)
{
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, 0x8200, 0x1d, 0);
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, 0x8000, 0x45, 0);
}
else
{
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, 0x0200, 0x1d, 0);
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, 0x0000, 0x45, 0);
}
}
else
{
scancode = freerdp_kbd_get_scancode_by_keycode(keycode, &flags);
#ifndef WITH_DEBUG_KBD
if (scancode == 0)
{
#endif
printf("xf_kb_send_key: (keycode=%d keysym=0x%04X scancode=%d)\n",
keycode, (unsigned int)XKeycodeToKeysym(xfi->display, keycode, 0), scancode);
#ifndef WITH_DEBUG_KBD
}
else
#endif
{
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, flags, scancode, 0);
}
}
}
static int
xf_kb_read_keyboard_state(xfInfo * xfi)
{
uint32 state;
Window wdummy;
int dummy;
XQueryPointer(xfi->display, xfi->wnd, &wdummy, &wdummy, &dummy, &dummy,
&dummy, &dummy, &state);
return state;
}
static RD_BOOL
xf_kb_get_key_state(xfInfo * xfi, int state, int keysym)
{
int modifierpos, key, keysymMask = 0;
int offset;
KeyCode keycode = XKeysymToKeycode(xfi->display, keysym);
if (keycode == NoSymbol)
{
return False;
}
for (modifierpos = 0; modifierpos < 8; modifierpos++)
{
offset = xfi->mod_map->max_keypermod * modifierpos;
for (key = 0; key < xfi->mod_map->max_keypermod; key++)
{
if (xfi->mod_map->modifiermap[offset + key] == keycode)
{
keysymMask |= 1 << modifierpos;
}
}
}
return (state & keysymMask) ? True : False;
}
int
xf_kb_get_toggle_keys_state(xfInfo * xfi)
{
int toggle_keys_state = 0;
int state;
state = xf_kb_read_keyboard_state(xfi);
if (xf_kb_get_key_state(xfi, state, XK_Scroll_Lock))
{
toggle_keys_state |= KBD_SYNC_SCROLL_LOCK;
}
if (xf_kb_get_key_state(xfi, state, XK_Num_Lock))
{
toggle_keys_state |= KBD_SYNC_NUM_LOCK;
}
if (xf_kb_get_key_state(xfi, state, XK_Caps_Lock))
{
toggle_keys_state |= KBD_SYNC_CAPS_LOCK;
}
if (xf_kb_get_key_state(xfi, state, XK_Kana_Lock))
{
toggle_keys_state |= KBD_SYNC_KANA_LOCK;
}
return toggle_keys_state;
}
void
xf_kb_focus_in(xfInfo * xfi)
{
int flags;
int scancode;
/* on focus in send a tab up like mstsc.exe */
scancode = freerdp_kbd_get_scancode_by_virtualkey(xfi->tab_key);
xfi->inst->rdp_send_input(xfi->inst, RDP_INPUT_SCANCODE, KBD_FLAG_UP, scancode, 0);
/* sync num, caps, scroll, kana lock */
flags = xf_kb_get_toggle_keys_state(xfi);
xfi->inst->rdp_sync_input(xfi->inst, flags);
}
void
xf_kb_set_keypress(uint8 keycode, KeySym keysym)
{
if (keycode < 8 || keycode > 255)
return;
pressed_keys[keycode] = keysym;
}
void
xf_kb_unset_keypress(uint8 keycode)
{
if (keycode < 8 || keycode > 255)
return;
pressed_keys[keycode] = NoSymbol;
}
static RD_BOOL
xf_kb_key_pressed(xfInfo * xfi, KeySym keysym)
{
KeyCode keycode = XKeysymToKeycode(xfi->display, keysym);
return pressed_keys[keycode] == keysym;
}
RD_BOOL
xf_kb_handle_special_keys(xfInfo * xfi, KeySym keysym)
{
if (keysym == XK_Return)
{
if ((xf_kb_key_pressed(xfi, XK_Alt_L) || xf_kb_key_pressed(xfi, XK_Alt_R))
&& (xf_kb_key_pressed(xfi, XK_Control_L) || xf_kb_key_pressed(xfi, XK_Control_R)))
{
/* Ctrl-Alt-Enter: toggle full screen */
xf_toggle_fullscreen(xfi);
return True;
}
}
return False;
}
X11/xf_keyboard.h deleted 100644 → 0
View file @ 2f4b9ab3
/*
Copyright (c) 2009-2010 Jay Sorg
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#ifndef __XF_KEYBOARD_H
#define __XF_KEYBOARD_H
#include <freerdp/freerdp.h>
#include "xf_types.h"
void
xf_kb_init(unsigned int keyboard_layout_id);
void
xf_kb_inst_init(xfInfo * xfi);
void
xf_kb_send_key(xfInfo * xfi, int flags, uint8 keycode);
int
xf_kb_get_toggle_keys_state(xfInfo * xfi);
void
xf_kb_focus_in(xfInfo * xfi);
void
xf_kb_set_keypress(uint8 keycode, KeySym keysym);
void
xf_kb_unset_keypress(uint8 keycode);
RD_BOOL
xf_kb_handle_special_keys(xfInfo * xfi, KeySym keysym);
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment