diff -Nru touchegg-0.3+repack/build/.svn/all-wcprops touchegg-1.0/build/.svn/all-wcprops --- touchegg-0.3+repack/build/.svn/all-wcprops 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/build/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 31 -/svn/!svn/ver/97/touchegg/build -END diff -Nru touchegg-0.3+repack/build/.svn/entries touchegg-1.0/build/.svn/entries --- touchegg-0.3+repack/build/.svn/entries 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/build/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/build -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - diff -Nru touchegg-0.3+repack/CHANGELOG touchegg-1.0/CHANGELOG --- touchegg-0.3+repack/CHANGELOG 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/CHANGELOG 2011-09-02 18:03:19.000000000 +0000 @@ -0,0 +1,85 @@ +[+] Touchégg v1.0 (2011/09/02) + - Now Touchégg subscribe to gestures in their own window, to not conflict with + applications that uses their own gestures + - Touchégg ported to GEIS v2 API + - Touchégg now uses a XML configuration file more intuitive, easy and cleaned + and some action configurations has been enchancement. + - The code is adapted to the Qt/KDE coding style + + Added support for the following actions: + - VERTICAL_SCROLL and HORIZONTALL_SCROLL actions now are SCROLL + - The SCROLL action support invert the movement, for touchscreen/trackpad + compatibility + + Added support for the following gestures: + - ROTATE - With 2 to 5 fingers + - DOUBLE_TAP - With 1 to 5 fingers + - DRAG - With 1 finger + + +[+] Touchégg v0.3 (2011/04/28) + - Touchégg now allow to assign different actions to different windows + - Added compatibility with uTouch 2, and therefore, with the Synaptics driver + and Ubuntu 11.04 + - Improved CPU usage + - Touchégg allows to interact with all windows, not only active windows + Now the actions are applied to the window under cursor + - Solved problems when a trackpad is removed or added. + + - MOVE_WINDOW now don't moves the desktop window + - RESIZE_WINDOW now don't resizes the desktop window + - CLOSE_WINDOW now can be used with drag or tap&hold gestures + - RESIZE WINDOW now is adapted to the angle of the pinch + - MOVE_WINDOW allows to use Kwin/Compiz effects like "Wobbly Windows" or + "Electric Borders" + - The MOUSE_MOVE action has been removed because in Natty is deprecated + + Added support for the following gestures: + - PINCH - With 2, 4 and 5 fingers + - DRAG - With 5 fingers + + Added support for the following actions: + - MOUSE_WHEEL_UP and MOUSE_WHEEL_DOWN actions now are VERTICAL_SCROLL + - LEFT_BUTTON_CLICK, RIGHT_BUTTON_CLICK and MIDDLE_BUTTON_CLICK actions now are + MOUSE_CLICK + - HORIZONTAL_SCROLL + - CHANGE_VIEWPORT + - DRAG_AND_DROP now support any button emulation + + +[+] Touchégg v0.2 (2011/03/11) + Solved bugs: + - Solved problems at shutdown + - Fixed _DESKTOP actions with compiz + - Fixes some problems with the code + Added support for the following gestures: + - TAP - With 5 fingers + - TAP & HOLD - With 2, 3, 4 and 5 fingers + Added support for the following actions: + - MOUSE_MOVE + - LEFT_BUTTON_CLICK + - MOVE_WINDOW + - RUN_COMMAND + - DRAG_AND_DROP + - SEND_KEYS + Other features: + - Added a GUI to manage gestures and actions + - Added menu entries to launch Touchégg and touchégg GUI + + +[+] Touchégg v0.1 (2011/01/23) + Initial release, support for the following gestures: + - TAP - With 2, 3 and 4 fingers + - PINCH - With 3 fingers + - DRAG - With 2, 3 and 4 fingers + Support for the following actions: + - RIGHT_BUTTON_CLICK + - MIDDLE_BUTTON_CLICK + - MOUSE_WHEEL_UP + - MOUSE_WHEEL_DOWN + - MINIMIZE_WINDOW + - MAXIMIZE_RESTORE_WINDOW + - CLOSE_WINDOW + - RESIZE_WINDOW + - SHOW_DESKTOP + - CHANGE_DESKTOP diff -Nru touchegg-0.3+repack/COPYING touchegg-1.0/COPYING --- touchegg-0.3+repack/COPYING 2011-08-15 12:51:56.000000000 +0000 +++ touchegg-1.0/COPYING 2011-05-25 14:58:05.000000000 +0000 @@ -1,11 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. @@ -68,7 +69,7 @@ The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS 0. Definitions. @@ -76,7 +77,7 @@ "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -509,7 +510,7 @@ covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties @@ -618,9 +619,9 @@ Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + 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 @@ -672,3 +673,5 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . + + diff -Nru touchegg-0.3+repack/COPYRIGHT touchegg-1.0/COPYRIGHT --- touchegg-0.3+repack/COPYRIGHT 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/COPYRIGHT 2011-05-25 15:03:52.000000000 +0000 @@ -0,0 +1 @@ +Copyright (C) 2011 José Expósito diff -Nru touchegg-0.3+repack/debian/changelog touchegg-1.0/debian/changelog --- touchegg-0.3+repack/debian/changelog 2011-08-24 16:44:45.000000000 +0000 +++ touchegg-1.0/debian/changelog 2011-09-21 13:44:29.000000000 +0000 @@ -1,14 +1,25 @@ +touchegg (1.0-0ubuntu1) oneiric; urgency=low + + * New upstream release (LP: #855491) + - debian/copyright: Upgrade to GPL-3+ + - debian/rules: The orig tarball is not repacked and use gzip + - Remove debian/source/options to be consistent with the tarball + - Remove pkg-kde-tools from deps + - Remove kubuntu_01_desktopfile_remove_xdg_open.diff + + -- Romain Perier Wed, 21 Sep 2011 15:44:04 +0200 + touchegg (0.3+repack-0ubuntu2) oneiric; urgency=low * Add debian/patches/kubuntu_01_desktopfile_remove_xdg_open.diff: Drop the line to exec the desktop file with xdg-open, it's not an executable. - -- Romain Perier Wed, 24 Aug 2011 18:44:10 +0200 + -- Romain Perier Wed, 24 Aug 2011 19:28:36 +0200 touchegg (0.3+repack-0ubuntu1) oneiric; urgency=low * Initial release: - Repack the original tarball to include the COPYING file about licensing - -- Romain Perier Thu, 18 Aug 2011 16:21:09 +0200 + -- Romain Perier Sat, 20 Aug 2011 16:35:55 +0200 diff -Nru touchegg-0.3+repack/debian/control touchegg-1.0/debian/control --- touchegg-0.3+repack/debian/control 2011-08-18 13:23:26.000000000 +0000 +++ touchegg-1.0/debian/control 2011-09-21 13:44:29.000000000 +0000 @@ -2,12 +2,12 @@ Section: misc Priority: optional Maintainer: Kubuntu Developers -Build-Depends: debhelper (>= 8.0.0), pkg-kde-tools, libqt4-dev, +Build-Depends: debhelper (>= 8.0.0), libqt4-dev, libutouch-geis-dev, libx11-dev, libxtst-dev, libxext-dev Standards-Version: 3.9.2 Homepage: http://code.google.com/p/touchegg Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/touchegg -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/touchegg +Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/touchegg Package: touchegg Architecture: any diff -Nru touchegg-0.3+repack/debian/copyright touchegg-1.0/debian/copyright --- touchegg-0.3+repack/debian/copyright 2011-08-18 13:37:10.000000000 +0000 +++ touchegg-1.0/debian/copyright 2011-09-21 13:44:29.000000000 +0000 @@ -4,13 +4,13 @@ Files: * Copyright: José Expósito -License: GPL-3 +License: GPL-3+ Files: debian/* Copyright: 2011 Kubuntu Developers -License: GPL-3 +License: GPL-3+ -License: GPL-3 +License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published by the Free Software Foundation. diff -Nru touchegg-0.3+repack/debian/patches/kubuntu_01_desktopfile_remove_xdg_open.diff touchegg-1.0/debian/patches/kubuntu_01_desktopfile_remove_xdg_open.diff --- touchegg-0.3+repack/debian/patches/kubuntu_01_desktopfile_remove_xdg_open.diff 2011-08-24 16:45:20.000000000 +0000 +++ touchegg-1.0/debian/patches/kubuntu_01_desktopfile_remove_xdg_open.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -A desktop file is not an executable - -Index: touchegg-0.3+repack/installation/touchegg.desktop -=================================================================== ---- touchegg-0.3+repack.orig/installation/touchegg.desktop 2011-08-24 18:45:13.763051096 +0200 -+++ touchegg-0.3+repack/installation/touchegg.desktop 2011-08-24 18:45:15.743051090 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env xdg-open - [Desktop Entry] - Name=Touchégg - Comment=Assign actions to multi touch gestures diff -Nru touchegg-0.3+repack/debian/patches/series touchegg-1.0/debian/patches/series --- touchegg-0.3+repack/debian/patches/series 2011-08-24 16:42:20.000000000 +0000 +++ touchegg-1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -kubuntu_01_desktopfile_remove_xdg_open.diff diff -Nru touchegg-0.3+repack/debian/rules touchegg-1.0/debian/rules --- touchegg-0.3+repack/debian/rules 2011-08-18 14:23:48.000000000 +0000 +++ touchegg-1.0/debian/rules 2011-09-21 13:44:29.000000000 +0000 @@ -1,3 +1,3 @@ #!/usr/bin/make -f %: - dh $@ --with lzma --dbg-package=touchegg-dbg + dh $@ --dbg-package=touchegg-dbg diff -Nru touchegg-0.3+repack/debian/source/options touchegg-1.0/debian/source/options --- touchegg-0.3+repack/debian/source/options 2011-08-15 14:46:09.000000000 +0000 +++ touchegg-1.0/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = "xz" -compression-level = 9 diff -Nru touchegg-0.3+repack/.directory touchegg-1.0/.directory --- touchegg-0.3+repack/.directory 2011-04-02 21:14:08.000000000 +0000 +++ touchegg-1.0/.directory 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2011,4,2,23,14,8 -Version=2 diff -Nru touchegg-0.3+repack/documentation/.directory touchegg-1.0/documentation/.directory --- touchegg-0.3+repack/documentation/.directory 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.directory 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-documents diff -Nru touchegg-0.3+repack/documentation/.svn/all-wcprops touchegg-1.0/documentation/.svn/all-wcprops --- touchegg-0.3+repack/documentation/.svn/all-wcprops 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 39 -/svn/!svn/ver/97/touchegg/documentation -END -.directory -K 25 -svn:wc:ra_dav:version-url -V 50 -/svn/!svn/ver/97/touchegg/documentation/.directory -END -doxyfile_en -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/97/touchegg/documentation/doxyfile_en -END -doxyfile_es -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/97/touchegg/documentation/doxyfile_es -END diff -Nru touchegg-0.3+repack/documentation/.svn/entries touchegg-1.0/documentation/.svn/entries --- touchegg-0.3+repack/documentation/.svn/entries 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/documentation -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -.directory -file - - - - -2011-03-23T00:27:30.828916Z -4a364fedb23b4f34402939992cb3dcd2 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -38 - -doxyfile_en -file - - - - -2011-03-23T00:27:30.828916Z -091124b9310187f09ce399de42ee0eed -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -69963 - -doxyfile_es -file - - - - -2011-03-23T00:27:30.828916Z -0837ef12080f57a303b374b04c1ba29f -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -69963 - diff -Nru touchegg-0.3+repack/documentation/.svn/text-base/.directory.svn-base touchegg-1.0/documentation/.svn/text-base/.directory.svn-base --- touchegg-0.3+repack/documentation/.svn/text-base/.directory.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.svn/text-base/.directory.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-documents diff -Nru touchegg-0.3+repack/documentation/.svn/text-base/doxyfile_en.svn-base touchegg-1.0/documentation/.svn/text-base/doxyfile_en.svn-base --- touchegg-0.3+repack/documentation/.svn/text-base/doxyfile_en.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.svn/text-base/doxyfile_en.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,1661 +0,0 @@ -# Doxyfile 1.7.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = Touchégg - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.2 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = YES - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this -# tag. The format is ext=language, where ext is a file extension, and language -# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, -# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions -# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = YES - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = NO - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = NO - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = NO - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = NO - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= NO - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = NO - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = NO - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. The create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = log - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the stylesheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = NO - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. - -FORMULA_TRANSPARENT = YES - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance -# between CPU load and processing speed. - -DOT_NUM_THREADS = 0 - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = YES - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff -Nru touchegg-0.3+repack/documentation/.svn/text-base/doxyfile_es.svn-base touchegg-1.0/documentation/.svn/text-base/doxyfile_es.svn-base --- touchegg-0.3+repack/documentation/.svn/text-base/doxyfile_es.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/documentation/.svn/text-base/doxyfile_es.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,1661 +0,0 @@ -# Doxyfile 1.7.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = Touchégg - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.2 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = Spanish - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = YES - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this -# tag. The format is ext=language, where ext is a file extension, and language -# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, -# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions -# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = YES - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = NO - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = NO - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = NO - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = NO - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= NO - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = NO - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = NO - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. The create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = log - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the stylesheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = NO - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. - -FORMULA_TRANSPARENT = YES - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance -# between CPU load and processing speed. - -DOT_NUM_THREADS = 0 - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = YES - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff -Nru touchegg-0.3+repack/installation/.directory touchegg-1.0/installation/.directory --- touchegg-0.3+repack/installation/.directory 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/installation/.directory 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-downloads diff -Nru touchegg-0.3+repack/installation/.svn/all-wcprops touchegg-1.0/installation/.svn/all-wcprops --- touchegg-0.3+repack/installation/.svn/all-wcprops 2011-04-27 23:31:16.000000000 +0000 +++ touchegg-1.0/installation/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 38 -/svn/!svn/ver/97/touchegg/installation -END -.directory -K 25 -svn:wc:ra_dav:version-url -V 49 -/svn/!svn/ver/97/touchegg/installation/.directory -END -touchegg.png -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/97/touchegg/installation/touchegg.png -END -touchegg.conf -K 25 -svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/116/touchegg/installation/touchegg.conf -END -touchegg.desktop -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/97/touchegg/installation/touchegg.desktop -END diff -Nru touchegg-0.3+repack/installation/.svn/entries touchegg-1.0/installation/.svn/entries --- touchegg-0.3+repack/installation/.svn/entries 2011-04-27 23:31:16.000000000 +0000 +++ touchegg-1.0/installation/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/installation -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -.directory -file - - - - -2011-03-23T00:27:29.920916Z -65c603d393c7540608a8b898356b8c64 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -38 - -touchegg.png -file - - - - -2011-03-23T00:27:29.920916Z -860cd0495016d1fa376e67b2258c4404 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 -has-props - - - - - - - - - - - - - - - - - - - - -9287 - -touchegg.conf -file -116 - - - -2011-04-27T22:46:48.319655Z -dfeaa2f05061abf1e17d7385a37aa34e -2011-04-27T23:30:56.262500Z -116 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1275 - -touchegg.desktop -file - - - - -2011-03-23T00:27:29.920916Z -9165fad105529b7974ad257f3fc91006 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -263 - diff -Nru touchegg-0.3+repack/installation/.svn/prop-base/touchegg.png.svn-base touchegg-1.0/installation/.svn/prop-base/touchegg.png.svn-base --- touchegg-0.3+repack/installation/.svn/prop-base/touchegg.png.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/installation/.svn/prop-base/touchegg.png.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 13 -svn:mime-type -V 24 -application/octet-stream -END diff -Nru touchegg-0.3+repack/installation/.svn/text-base/.directory.svn-base touchegg-1.0/installation/.svn/text-base/.directory.svn-base --- touchegg-0.3+repack/installation/.svn/text-base/.directory.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/installation/.svn/text-base/.directory.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-downloads diff -Nru touchegg-0.3+repack/installation/.svn/text-base/touchegg.conf.svn-base touchegg-1.0/installation/.svn/text-base/touchegg.conf.svn-base --- touchegg-0.3+repack/installation/.svn/text-base/touchegg.conf.svn-base 2011-04-27 23:31:10.000000000 +0000 +++ touchegg-1.0/installation/.svn/text-base/touchegg.conf.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -general_settings.tap_and_hold_time=135 - - -TWO_FINGERS_TAP.ALL.action=MOUSE_CLICK -TWO_FINGERS_TAP.ALL.settings=BUTTON=3 -THREE_FINGERS_TAP.ALL.action=MOUSE_CLICK -THREE_FINGERS_TAP.ALL.settings=BUTTON=2 -FIVE_FINGERS_TAP.ALL.action=CLOSE_WINDOW - - -THREE_FINGERS_PINCH.ALL.action=RESIZE_WINDOW - - -TWO_FINGERS_DRAG_UP.ALL.action=VERTICAL_SCROLL -TWO_FINGERS_DRAG_UP.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_DOWN.ALL.action=VERTICAL_SCROLL -TWO_FINGERS_DRAG_DOWN.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_LEFT.ALL.action=HORIZONTAL_SCROLL -TWO_FINGERS_DRAG_LEFT.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_RIGHT.ALL.action=HORIZONTAL_SCROLL -TWO_FINGERS_DRAG_RIGHT.ALL.settings=SPEED=7 - - -THREE_FINGERS_DRAG_UP.ALL.action=MAXIMIZE_RESTORE_WINDOW -THREE_FINGERS_DRAG_DOWN.ALL.action=MINIMIZE_WINDOW -THREE_FINGERS_DRAG_LEFT.ALL.action=MOVE_WINDOW -THREE_FINGERS_DRAG_RIGHT.ALL.action=MOVE_WINDOW - - -FOUR_FINGERS_DRAG_UP.ALL.action=SEND_KEYS -FOUR_FINGERS_DRAG_UP.ALL.settings=HOLD_DOWN=Super_L:PRESS=W -FOUR_FINGERS_DRAG_DOWN.ALL.action=SHOW_DESKTOP -FOUR_FINGERS_DRAG_LEFT.ALL.action=CHANGE_VIEWPORT -FOUR_FINGERS_DRAG_LEFT.ALL.settings=DIRECTION=PREVIOUS -FOUR_FINGERS_DRAG_RIGHT.ALL.action=CHANGE_VIEWPORT -FOUR_FINGERS_DRAG_RIGHT.ALL.settings=DIRECTION=NEXT - - -THREE_FINGERS_TAP_AND_HOLD.ALL.action=MOVE_WINDOW diff -Nru touchegg-0.3+repack/installation/.svn/text-base/touchegg.desktop.svn-base touchegg-1.0/installation/.svn/text-base/touchegg.desktop.svn-base --- touchegg-0.3+repack/installation/.svn/text-base/touchegg.desktop.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/installation/.svn/text-base/touchegg.desktop.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Name=Touchégg -Comment=Assign actions to multi touch gestures -Comment[es]=Asigne acciones a su gestos táctiles -Type=Application -Exec=/usr/bin/touchegg -Terminal=false -Icon=touchegg.png -Categories=Utility -StartupNotify=true Binary files /tmp/363RjnTGV2/touchegg-0.3+repack/installation/.svn/text-base/touchegg.png.svn-base and /tmp/eIdzK8pkKV/touchegg-1.0/installation/.svn/text-base/touchegg.png.svn-base differ diff -Nru touchegg-0.3+repack/installation/touchegg.conf touchegg-1.0/installation/touchegg.conf --- touchegg-0.3+repack/installation/touchegg.conf 2011-04-27 22:46:48.000000000 +0000 +++ touchegg-1.0/installation/touchegg.conf 2011-09-03 19:02:04.000000000 +0000 @@ -1,39 +1,98 @@ -general_settings.tap_and_hold_time=135 + + + + 0 + + + + + + + BUTTON=3 + + + + BUTTON=2 + + + + + + + + SPEED=7:INVERTED=false + + + + + + + + + + + + + + + + + + + + + + Super+W + + + + + + + + + + + + + Alt+F1 + + + + + + + + + Control+KP_Add + + + + Control+KP_Subtract + + + + Control+L + + + + Control+R + + + + + + + + + Alt+Left + + + + Alt+Right + + + -TWO_FINGERS_TAP.ALL.action=MOUSE_CLICK -TWO_FINGERS_TAP.ALL.settings=BUTTON=3 -THREE_FINGERS_TAP.ALL.action=MOUSE_CLICK -THREE_FINGERS_TAP.ALL.settings=BUTTON=2 -FIVE_FINGERS_TAP.ALL.action=CLOSE_WINDOW - - -THREE_FINGERS_PINCH.ALL.action=RESIZE_WINDOW - - -TWO_FINGERS_DRAG_UP.ALL.action=VERTICAL_SCROLL -TWO_FINGERS_DRAG_UP.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_DOWN.ALL.action=VERTICAL_SCROLL -TWO_FINGERS_DRAG_DOWN.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_LEFT.ALL.action=HORIZONTAL_SCROLL -TWO_FINGERS_DRAG_LEFT.ALL.settings=SPEED=7 -TWO_FINGERS_DRAG_RIGHT.ALL.action=HORIZONTAL_SCROLL -TWO_FINGERS_DRAG_RIGHT.ALL.settings=SPEED=7 - - -THREE_FINGERS_DRAG_UP.ALL.action=MAXIMIZE_RESTORE_WINDOW -THREE_FINGERS_DRAG_DOWN.ALL.action=MINIMIZE_WINDOW -THREE_FINGERS_DRAG_LEFT.ALL.action=MOVE_WINDOW -THREE_FINGERS_DRAG_RIGHT.ALL.action=MOVE_WINDOW - - -FOUR_FINGERS_DRAG_UP.ALL.action=SEND_KEYS -FOUR_FINGERS_DRAG_UP.ALL.settings=HOLD_DOWN=Super_L:PRESS=W -FOUR_FINGERS_DRAG_DOWN.ALL.action=SHOW_DESKTOP -FOUR_FINGERS_DRAG_LEFT.ALL.action=CHANGE_VIEWPORT -FOUR_FINGERS_DRAG_LEFT.ALL.settings=DIRECTION=PREVIOUS -FOUR_FINGERS_DRAG_RIGHT.ALL.action=CHANGE_VIEWPORT -FOUR_FINGERS_DRAG_RIGHT.ALL.settings=DIRECTION=NEXT - - -THREE_FINGERS_TAP_AND_HOLD.ALL.action=MOVE_WINDOW + diff -Nru touchegg-0.3+repack/installation/touchegg.desktop touchegg-1.0/installation/touchegg.desktop --- touchegg-0.3+repack/installation/touchegg.desktop 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/installation/touchegg.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Name=Touchégg -Comment=Assign actions to multi touch gestures -Comment[es]=Asigne acciones a su gestos táctiles -Type=Application -Exec=/usr/bin/touchegg -Terminal=false -Icon=touchegg.png -Categories=Utility -StartupNotify=true Binary files /tmp/363RjnTGV2/touchegg-0.3+repack/installation/touchegg.png and /tmp/eIdzK8pkKV/touchegg-1.0/installation/touchegg.png differ diff -Nru touchegg-0.3+repack/README touchegg-1.0/README --- touchegg-0.3+repack/README 2011-04-27 22:30:20.000000000 +0000 +++ touchegg-1.0/README 2011-09-02 17:59:56.000000000 +0000 @@ -7,4 +7,5 @@ 3 - Make a gesture, for example drag two fingers over your trackpad. If all works fine, the name of the gesture will appear. -4 - To use your own configuration edit ~/.touchegg/touchegg.conf or use the GUI. +4 - To use your own configuration edit ~/.config/touchegg/touchegg.conf or use + the GUI. diff -Nru touchegg-0.3+repack/src/.directory touchegg-1.0/src/.directory --- touchegg-0.3+repack/src/.directory 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/.directory 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-development diff -Nru touchegg-0.3+repack/src/.svn/all-wcprops touchegg-1.0/src/.svn/all-wcprops --- touchegg-0.3+repack/src/.svn/all-wcprops 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 29 -/svn/!svn/ver/97/touchegg/src -END -.directory -K 25 -svn:wc:ra_dav:version-url -V 40 -/svn/!svn/ver/97/touchegg/src/.directory -END diff -Nru touchegg-0.3+repack/src/.svn/entries touchegg-1.0/src/.svn/entries --- touchegg-0.3+repack/src/.svn/entries 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -.directory -file - - - - -2011-03-23T00:27:30.468916Z -47f5f5e3f52f3287d1d3ee2aa1d83c29 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -40 - -touchegg -dir - diff -Nru touchegg-0.3+repack/src/.svn/text-base/.directory.svn-base touchegg-1.0/src/.svn/text-base/.directory.svn-base --- touchegg-0.3+repack/src/.svn/text-base/.directory.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/src/.svn/text-base/.directory.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[Desktop Entry] -Icon=folder-development diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/ActionFactory.cpp touchegg-1.0/src/touchegg/actions/factory/ActionFactory.cpp --- touchegg-0.3+repack/src/touchegg/actions/factory/ActionFactory.cpp 2011-04-13 09:59:34.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/ActionFactory.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,27 +1,33 @@ /** * @file /src/touchegg/actions/factory/ActionFactory.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ActionFactory - * @author José Expósito */ #include "ActionFactory.h" - // ************************************************************************** // // ********** STATIC METHODS AND VARIABLES ********** // // ************************************************************************** // ActionFactory* ActionFactory::instance = NULL; -ActionFactory* ActionFactory::getInstance() { +ActionFactory* ActionFactory::getInstance() +{ if(ActionFactory::instance == NULL) ActionFactory::instance = new ActionFactory(); @@ -34,7 +40,8 @@ // ************************************************************************** // Action* ActionFactory::createAction(ActionTypeEnum::ActionType actionType, - const QString& settings, Window window) { + const QString& settings, Window window) +{ switch(actionType) { case ActionTypeEnum::NO_ACTION: return NULL; @@ -42,11 +49,8 @@ case ActionTypeEnum::MOUSE_CLICK: return new MouseClick(settings, window); - case ActionTypeEnum::VERTICAL_SCROLL: - return new VerticalScroll(settings, window); - - case ActionTypeEnum::HORIZONTAL_SCROLL: - return new HorizontalScroll(settings, window); + case ActionTypeEnum::SCROLL: + return new Scroll(settings, window); case ActionTypeEnum::MINIMIZE_WINDOW: return new MinimizeWindow(settings, window); diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/ActionFactory.h touchegg-1.0/src/touchegg/actions/factory/ActionFactory.h --- touchegg-0.3+repack/src/touchegg/actions/factory/ActionFactory.h 2011-04-13 09:59:34.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/ActionFactory.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/factory/ActionFactory.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ActionFactory - * @author José Expósito */ #ifndef ACTIONFACTORY_H #define ACTIONFACTORY_H @@ -20,8 +26,7 @@ #include "src/touchegg/actions/types/ActionTypeEnum.h" #include "src/touchegg/actions/implementation/Action.h" #include "src/touchegg/actions/implementation/MouseClick.h" -#include "src/touchegg/actions/implementation/VerticalScroll.h" -#include "src/touchegg/actions/implementation/HorizontalScroll.h" +#include "src/touchegg/actions/implementation/Scroll.h" #include "src/touchegg/actions/implementation/MinimizeWindow.h" #include "src/touchegg/actions/implementation/MaximizeRestoreWindow.h" #include "src/touchegg/actions/implementation/CloseWindow.h" @@ -34,7 +39,6 @@ #include "src/touchegg/actions/implementation/RunCommand.h" #include "src/touchegg/actions/implementation/DragAndDrop.h" - /** * @~spanish * Factoría para crear las distintas acciones. @@ -42,56 +46,57 @@ * @~english * Factory to create the different actions. */ -class ActionFactory { +class ActionFactory +{ - private: +private: - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static ActionFactory* instance; - - // Hide constructors - ActionFactory(){} - ActionFactory(const ActionFactory&); - const ActionFactory& operator = (const ActionFactory&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static ActionFactory* getInstance(); - - /** - * @~spanish - * Crea la acción indicada, si no existe devuelve NULL. - * IMPORTANTE: No olvidar liberar memoria. - * @param actionType Tipo de acción a crear. - * @param settings Configuración de la acción. - * @param window Ventana sobre la que ejecutar la acción. - * @return La acción. - * - * @~english - * Creates the specified action, if it not exist returns NULL. - * IMPORTANT: Don't forget to free memory. - * @param actionType Action type to create. - * @param settings Action settings. - * @param window Window on which execute the action. - * @return The action. - */ - Action* createAction(ActionTypeEnum::ActionType actionType, - const QString& settings, Window window); + /** + * @~spanish + * Única instancia de la clase. + * + * @~english + * Single instance of the class. + */ + static ActionFactory* instance; + + // Hide constructors + ActionFactory(){} + ActionFactory(const ActionFactory&); + const ActionFactory& operator = (const ActionFactory&); + +public: + + /** + * @~spanish + * Único método para obtener una instancia de la clase. + * @return La única instancia de la clase. + * + * @~english + * Only method to get an instance of the class. + * @return The single instance of the class. + */ + static ActionFactory* getInstance(); + + /** + * @~spanish + * Crea la acción indicada, si no existe devuelve NULL. + * IMPORTANTE: No olvidar liberar memoria. + * @param actionType Tipo de acción a crear. + * @param settings Configuración de la acción. + * @param window Ventana sobre la que ejecutar la acción. + * @return La acción. + * + * @~english + * Creates the specified action, if it not exist returns NULL. + * IMPORTANT: Don't forget to free memory. + * @param actionType Action type to create. + * @param settings Action settings. + * @param window Window on which execute the action. + * @return The action. + */ + Action* createAction(ActionTypeEnum::ActionType actionType, + const QString& settings, Window window); }; diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/.svn/all-wcprops touchegg-1.0/src/touchegg/actions/factory/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/actions/factory/.svn/all-wcprops 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/factory -END -actions.factory.pri -K 25 -svn:wc:ra_dav:version-url -V 74 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/factory/actions.factory.pri -END -ActionFactory.cpp -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/factory/ActionFactory.cpp -END -ActionFactory.h -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/factory/ActionFactory.h -END diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/.svn/entries touchegg-1.0/src/touchegg/actions/factory/.svn/entries --- touchegg-0.3+repack/src/touchegg/actions/factory/.svn/entries 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/actions/factory -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -actions.factory.pri -file - - - - -2011-03-23T00:27:30.288916Z -06716f4bffe956a269c7b9fa8dfe5e7d -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -130 - -ActionFactory.cpp -file -108 - - - -2011-04-13T09:59:34.323438Z -237443f0187aca1cdc551a171f1df700 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2719 - -ActionFactory.h -file -108 - - - -2011-04-13T09:59:34.323438Z -1f1859991db8b5d2416a174a85f8f0a8 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3327 - diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/ActionFactory.cpp.svn-base touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/ActionFactory.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/ActionFactory.cpp.svn-base 2011-04-13 10:11:26.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/ActionFactory.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/** - * @file /src/touchegg/actions/factory/ActionFactory.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ActionFactory - * @author José Expósito - */ -#include "ActionFactory.h" - - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -ActionFactory* ActionFactory::instance = NULL; - -ActionFactory* ActionFactory::getInstance() { - if(ActionFactory::instance == NULL) - ActionFactory::instance = new ActionFactory(); - - return ActionFactory::instance; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -Action* ActionFactory::createAction(ActionTypeEnum::ActionType actionType, - const QString& settings, Window window) { - switch(actionType) { - case ActionTypeEnum::NO_ACTION: - return NULL; - - case ActionTypeEnum::MOUSE_CLICK: - return new MouseClick(settings, window); - - case ActionTypeEnum::VERTICAL_SCROLL: - return new VerticalScroll(settings, window); - - case ActionTypeEnum::HORIZONTAL_SCROLL: - return new HorizontalScroll(settings, window); - - case ActionTypeEnum::MINIMIZE_WINDOW: - return new MinimizeWindow(settings, window); - - case ActionTypeEnum::MAXIMIZE_RESTORE_WINDOW: - return new MaximizeRestoreWindow(settings, window); - - case ActionTypeEnum::CLOSE_WINDOW: - return new CloseWindow(settings, window); - - case ActionTypeEnum::RESIZE_WINDOW: - return new ResizeWindow(settings, window); - - case ActionTypeEnum::SHOW_DESKTOP: - return new ShowDesktop(settings, window); - - case ActionTypeEnum::CHANGE_DESKTOP: - return new ChangeDesktop(settings, window); - - case ActionTypeEnum::CHANGE_VIEWPORT: - return new ChangeViewport(settings, window); - - case ActionTypeEnum::SEND_KEYS: - return new SendKeys(settings, window); - - case ActionTypeEnum::MOVE_WINDOW: - return new MoveWindow(settings, window); - - case ActionTypeEnum::RUN_COMMAND: - return new RunCommand(settings, window); - - case ActionTypeEnum::DRAG_AND_DROP: - return new DragAndDrop(settings, window); - - default: - return NULL; - } -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/ActionFactory.h.svn-base touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/ActionFactory.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/ActionFactory.h.svn-base 2011-04-13 10:11:27.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/ActionFactory.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/** - * @file /src/touchegg/actions/factory/ActionFactory.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ActionFactory - * @author José Expósito - */ -#ifndef ACTIONFACTORY_H -#define ACTIONFACTORY_H - -#include "src/touchegg/actions/types/ActionTypeEnum.h" -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/types/ActionTypeEnum.h" -#include "src/touchegg/actions/implementation/Action.h" -#include "src/touchegg/actions/implementation/MouseClick.h" -#include "src/touchegg/actions/implementation/VerticalScroll.h" -#include "src/touchegg/actions/implementation/HorizontalScroll.h" -#include "src/touchegg/actions/implementation/MinimizeWindow.h" -#include "src/touchegg/actions/implementation/MaximizeRestoreWindow.h" -#include "src/touchegg/actions/implementation/CloseWindow.h" -#include "src/touchegg/actions/implementation/ResizeWindow.h" -#include "src/touchegg/actions/implementation/ShowDesktop.h" -#include "src/touchegg/actions/implementation/ChangeDesktop.h" -#include "src/touchegg/actions/implementation/ChangeViewport.h" -#include "src/touchegg/actions/implementation/SendKeys.h" -#include "src/touchegg/actions/implementation/MoveWindow.h" -#include "src/touchegg/actions/implementation/RunCommand.h" -#include "src/touchegg/actions/implementation/DragAndDrop.h" - - -/** - * @~spanish - * Factoría para crear las distintas acciones. - * - * @~english - * Factory to create the different actions. - */ -class ActionFactory { - - private: - - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static ActionFactory* instance; - - // Hide constructors - ActionFactory(){} - ActionFactory(const ActionFactory&); - const ActionFactory& operator = (const ActionFactory&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static ActionFactory* getInstance(); - - /** - * @~spanish - * Crea la acción indicada, si no existe devuelve NULL. - * IMPORTANTE: No olvidar liberar memoria. - * @param actionType Tipo de acción a crear. - * @param settings Configuración de la acción. - * @param window Ventana sobre la que ejecutar la acción. - * @return La acción. - * - * @~english - * Creates the specified action, if it not exist returns NULL. - * IMPORTANT: Don't forget to free memory. - * @param actionType Action type to create. - * @param settings Action settings. - * @param window Window on which execute the action. - * @return The action. - */ - Action* createAction(ActionTypeEnum::ActionType actionType, - const QString& settings, Window window); - -}; - -#endif // ACTIONFACTORY_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/actions.factory.pri.svn-base touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/actions.factory.pri.svn-base --- touchegg-0.3+repack/src/touchegg/actions/factory/.svn/text-base/actions.factory.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/factory/.svn/text-base/actions.factory.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/actions/factory/ActionFactory.h - -SOURCES += \ - src/touchegg/actions/factory/ActionFactory.cpp diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/Action.h touchegg-1.0/src/touchegg/actions/implementation/Action.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/Action.h 2011-04-13 10:01:34.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/Action.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,23 +1,28 @@ /** * @file /src/touchegg/actions/implementation/Action.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class Action - * @author José Expósito */ #ifndef ACTION_H #define ACTION_H #include "src/touchegg/util/Include.h" - /** * @~spanish * Clase de la que deben heredar todas las acciones. Las acciones son @@ -28,90 +33,90 @@ * Class that should inherit all actions. Actions are operations associated with * a gesture that will be executed when this gesture is caught. */ -class Action { +class Action +{ - protected: +protected: - /** - * @~spanish - * Configuración de la acción. - * - * @~english - * Action settings. - */ - QString settings; - - /** - * @~spanish - * Ventana sobre la que se realiza la acción. - * - * @~english - * Window on which execute the action. - */ - Window window; - - public: - - /** - * @~spanish - * Constructor. - * @param settings Configuración del gesto. - * @param window Ventana sobre la que se realiza el gesto. - * - * @~english - * Constructor. - * @param settings Gesture settings. - * @param window Window on which execute the action. - */ - Action(const QString& settings, Window window) { - this->settings = settings; - this->window = window; - } - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se inicie. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture is started. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeStart(const QHash& attrs) = 0; - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se actualice. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture is updated. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeUpdate(const QHash& attrs) = 0; - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se finalice. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture finish. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeFinish(const QHash& attrs) = 0; + /** + * @~spanish + * Configuración de la acción. + * + * @~english + * Action settings. + */ + QString settings; + + /** + * @~spanish + * Ventana sobre la que se realiza la acción. + * + * @~english + * Window on which execute the action. + */ + Window window; + +public: + + /** + * @~spanish + * Constructor. + * @param settings Configuración del gesto. + * @param window Ventana sobre la que se realiza el gesto. + * + * @~english + * Constructor. + * @param settings Gesture settings. + * @param window Window on which execute the action. + */ + Action(const QString& settings, Window window) : + settings(settings), + window(window) {} + + /** + * @~spanish + * Parte de la acción que se ejecutará cuando el gesto se inicie. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * + * @~english + * Part of the action that will be executed when the gesture is started. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + */ + virtual void executeStart(const QHash& attrs) = 0; + + /** + * @~spanish + * Parte de la acción que se ejecutará cuando el gesto se actualice. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * + * @~english + * Part of the action that will be executed when the gesture is updated. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + */ + virtual void executeUpdate(const QHash& attrs) = 0; + + /** + * @~spanish + * Parte de la acción que se ejecutará cuando el gesto se finalice. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * + * @~english + * Part of the action that will be executed when the gesture finish. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + */ + virtual void executeFinish(const QHash& attrs) = 0; }; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/actions.implementation.pri touchegg-1.0/src/touchegg/actions/implementation/actions.implementation.pri --- touchegg-0.3+repack/src/touchegg/actions/implementation/actions.implementation.pri 2011-04-13 08:53:01.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/actions.implementation.pri 2011-05-25 14:58:05.000000000 +0000 @@ -11,10 +11,9 @@ src/touchegg/actions/implementation/MoveWindow.h \ src/touchegg/actions/implementation/RunCommand.h \ src/touchegg/actions/implementation/DragAndDrop.h \ - src/touchegg/actions/implementation/VerticalScroll.h \ - src/touchegg/actions/implementation/HorizontalScroll.h \ src/touchegg/actions/implementation/ChangeViewport.h \ - src/touchegg/actions/implementation/MouseClick.h + src/touchegg/actions/implementation/MouseClick.h \ + src/touchegg/actions/implementation/Scroll.h SOURCES += \ src/touchegg/actions/implementation/MinimizeWindow.cpp \ @@ -27,7 +26,6 @@ src/touchegg/actions/implementation/MoveWindow.cpp \ src/touchegg/actions/implementation/RunCommand.cpp \ src/touchegg/actions/implementation/DragAndDrop.cpp \ - src/touchegg/actions/implementation/VerticalScroll.cpp \ - src/touchegg/actions/implementation/HorizontalScroll.cpp \ src/touchegg/actions/implementation/ChangeViewport.cpp \ - src/touchegg/actions/implementation/MouseClick.cpp + src/touchegg/actions/implementation/MouseClick.cpp \ + src/touchegg/actions/implementation/Scroll.cpp diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeDesktop.cpp touchegg-1.0/src/touchegg/actions/implementation/ChangeDesktop.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeDesktop.cpp 2011-04-13 09:58:12.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ChangeDesktop.cpp 2011-07-12 13:52:59.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ChangeDesktop.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ChangeDesktop - * @author José Expósito */ #include "ChangeDesktop.h" @@ -19,21 +25,16 @@ // ************************************************************************** // ChangeDesktop::ChangeDesktop(const QString& settings, Window window) - : Action(settings, window) { - this->toRight = true; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "DIRECTION") { - QString configDir = strl.at(1); - if(configDir == "PREVIOUS") - this->toRight = false; - else if(configDir == "NEXT") - this->toRight = true; - else - qWarning() << "Error reading CHANGE_DESKTOP settings, using " << - "the default settings"; - } else - qWarning() << "Error reading CHANGE_DESKTOP settings, using " << + : Action(settings, window) +{ + this->next = true; + + if(settings == "PREVIOUS") + this->next = false; + else if(settings == "NEXT") + this->next = true; + else + qWarning() << "Error reading CHANGE_VIEWPORT settings, using " << "the default settings"; } @@ -46,7 +47,8 @@ void ChangeDesktop::executeUpdate(const QHash& /*attrs*/) {} -void ChangeDesktop::executeFinish(const QHash& /*attrs*/) { +void ChangeDesktop::executeFinish(const QHash& /*attrs*/) +{ // Obtenemos el número total de escritorios Atom atomRet; int size; @@ -69,7 +71,7 @@ XFree(propRet); // Cambiamos al escritorio siguiente o anterior - int nextDesktop = this->toRight + int nextDesktop = this->next ? (currentDesktop + 1) % numDesktops : (currentDesktop - 1 + numDesktops) % numDesktops; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeDesktop.h touchegg-1.0/src/touchegg/actions/implementation/ChangeDesktop.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeDesktop.h 2011-04-13 09:58:12.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ChangeDesktop.h 2011-07-12 13:52:59.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ChangeDesktop.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class ChangeDesktop - * @author José Expósito */ #ifndef CHANGEDESKTOP_H #define CHANGEDESKTOP_H @@ -25,28 +31,29 @@ * @~english * Change the desktop. */ -class ChangeDesktop : public Action { +class ChangeDesktop : public Action +{ - private: +private: - /** - * @~spanish - * Dirección en la que cambiar de escritorio. - * - * @~english - * Direction to switch desktops. - */ - bool toRight; + /** + * @~spanish + * Dirección en la que cambiar de escritorio. + * + * @~english + * Direction to switch desktops. + */ + bool next; - public: +public: - ChangeDesktop(const QString& settings, Window window); + ChangeDesktop(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // CHANGEDESKTOP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeViewport.cpp touchegg-1.0/src/touchegg/actions/implementation/ChangeViewport.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeViewport.cpp 2011-04-11 16:53:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ChangeViewport.cpp 2011-07-12 13:52:59.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ChangeViewport.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ChangeViewport - * @author José Expósito */ #include "ChangeViewport.h" @@ -19,20 +25,15 @@ // ************************************************************************** // ChangeViewport::ChangeViewport(const QString& settings, Window window) - : Action(settings, window) { + : Action(settings, window) +{ this->next = true; - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "DIRECTION") { - QString configDir = strl.at(1); - if(configDir == "PREVIOUS") - this->next = false; - else if(configDir == "NEXT") - this->next = true; - else - qWarning() << "Error reading CHANGE_VIEWPORT settings, using " << - "the default settings"; - } else + if(settings == "PREVIOUS") + this->next = false; + else if(settings == "NEXT") + this->next = true; + else qWarning() << "Error reading CHANGE_VIEWPORT settings, using " << "the default settings"; } @@ -46,7 +47,8 @@ void ChangeViewport::executeUpdate(const QHash& /*attrs*/) {} -void ChangeViewport::executeFinish(const QHash& /*attrs*/) { +void ChangeViewport::executeFinish(const QHash& /*attrs*/) +{ // Obtenemos el tamaño total de todos los viewports juntos Atom atomRet; int size; @@ -62,6 +64,9 @@ widthViews = aux[0]; heightViews = aux[1]; XFree(propRet); + + if(widthViews == 0 || heightViews == 0) + return; } else { return; } diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeViewport.h touchegg-1.0/src/touchegg/actions/implementation/ChangeViewport.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/ChangeViewport.h 2011-04-11 09:32:47.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ChangeViewport.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ChangeViewport.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class ChangeDesktop - * @author José Expósito */ #ifndef CHANGEVIEWPORT_H #define CHANGEVIEWPORT_H @@ -25,28 +31,29 @@ * @~english * Change the viewport. */ -class ChangeViewport : public Action { +class ChangeViewport : public Action +{ - private: +private: - /** - * @~spanish - * Dirección en la que cambiar de escritorio. - * - * @~english - * Direction to switch desktops. - */ - bool next; + /** + * @~spanish + * Dirección en la que cambiar de escritorio. + * + * @~english + * Direction to switch desktops. + */ + bool next; - public: +public: - ChangeViewport(const QString& settings, Window window); + ChangeViewport(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // CHANGEVIEWPORT_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/CloseWindow.cpp touchegg-1.0/src/touchegg/actions/implementation/CloseWindow.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/CloseWindow.cpp 2011-03-30 21:47:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/CloseWindow.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/CloseWindow.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class CloseWindow - * @author José Expósito */ #include "CloseWindow.h" @@ -30,7 +36,8 @@ void CloseWindow::executeUpdate(const QHash& /*attrs*/) {} -void CloseWindow::executeFinish(const QHash& /*attrs*/) { +void CloseWindow::executeFinish(const QHash& /*attrs*/) +{ // Cerramos la ventana XClientMessageEvent event; event.window = this->window; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/CloseWindow.h touchegg-1.0/src/touchegg/actions/implementation/CloseWindow.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/CloseWindow.h 2011-03-30 21:46:02.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/CloseWindow.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/CloseWindow.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class CloseWindow - * @author José Expósito */ #ifndef CLOSEWINDOW_H #define CLOSEWINDOW_H @@ -25,17 +31,18 @@ * @~english * Closes the active window. */ -class CloseWindow : public Action { +class CloseWindow : public Action +{ - public: +public: - CloseWindow(const QString& settings, Window window); + CloseWindow(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // CLOSEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/DragAndDrop.cpp touchegg-1.0/src/touchegg/actions/implementation/DragAndDrop.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/DragAndDrop.cpp 2011-04-13 09:21:53.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/DragAndDrop.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/DragAndDrop.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class DragAndDrop - * @author José Expósito */ #include "DragAndDrop.h" @@ -19,7 +25,8 @@ // ************************************************************************** // DragAndDrop::DragAndDrop(const QString& settings, Window window) - : Action(settings, window) { + : Action(settings, window) +{ this->button = 1; QStringList strl = settings.split("="); @@ -42,11 +49,13 @@ // ********** PUBLIC METHODS ********** // // ************************************************************************** // -void DragAndDrop::executeStart(const QHash& /*attrs*/) { +void DragAndDrop::executeStart(const QHash& /*attrs*/) +{ XTestFakeButtonEvent(QX11Info::display(), this->button, true, 0); } -void DragAndDrop::executeUpdate(const QHash& attrs) { +void DragAndDrop::executeUpdate(const QHash& attrs) +{ if(!attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_X) || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_Y)) return; @@ -57,6 +66,7 @@ + attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat()); } -void DragAndDrop::executeFinish(const QHash& /*attrs*/) { +void DragAndDrop::executeFinish(const QHash& /*attrs*/) +{ XTestFakeButtonEvent(QX11Info::display(), this->button, false, 0); } diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/DragAndDrop.h touchegg-1.0/src/touchegg/actions/implementation/DragAndDrop.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/DragAndDrop.h 2011-04-13 09:21:53.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/DragAndDrop.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/DragAndDrop.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class DragAndDrop - * @author José Expósito */ #ifndef DRAGANDDROP_H #define DRAGANDDROP_H @@ -27,26 +33,26 @@ */ class DragAndDrop : public Action { - private: +private: - /** - * @~spanish - * Botón a emular. - * - * @~english - * Button to emulate. - */ - int button; + /** + * @~spanish + * Botón a emular. + * + * @~english + * Button to emulate. + */ + int button; - public: +public: - DragAndDrop(const QString& settings, Window window); + DragAndDrop(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // DRAGANDDROP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/HorizontalScroll.cpp touchegg-1.0/src/touchegg/actions/implementation/HorizontalScroll.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/HorizontalScroll.cpp 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/HorizontalScroll.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/HorizontalScroll.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class HorizontalScroll - * @author José Expósito - */ -#include "HorizontalScroll.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -HorizontalScroll::HorizontalScroll(const QString& settings, Window window) - : Action(settings, window) { - this->leftScrollSpace = 0; - this->rightScrollSpace = 0; - this->speed = 30; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "SPEED") { - bool ok; - int configSpeed = QString(strl.at(1)).toInt(&ok); - if(ok && configSpeed >= 1 && configSpeed <= 10) - this->speed = 40 - 2*configSpeed; - else - qWarning() << "Error reading HORIZONTAL_SCROLL settings, using " << - "the default settings"; - } else - qWarning() << "Error reading HORIZONTAL_SCROLL settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void HorizontalScroll::executeStart(const QHash& /*attrs*/) {} - -void HorizontalScroll::executeUpdate(const QHash& attrs) { - float deltaX = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat(); - - if(deltaX > 0) { - this->rightScrollSpace += (int)deltaX; - - while(this->rightScrollSpace >= this->speed) { - this->rightScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), 7, true, 0); - XTestFakeButtonEvent(QX11Info::display(), 7, false, 0); - XFlush(QX11Info::display()); - } - - } else { - this->leftScrollSpace -= (int)deltaX; - - while(this->leftScrollSpace >= this->speed) { - this->leftScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), 6, true, 0); - XTestFakeButtonEvent(QX11Info::display(), 6, false, 0); - XFlush(QX11Info::display()); - } - } -} - -void HorizontalScroll::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/HorizontalScroll.h touchegg-1.0/src/touchegg/actions/implementation/HorizontalScroll.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/HorizontalScroll.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/HorizontalScroll.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/HorizontalScroll.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class HorizontalScroll - * @author José Expósito - */ -#ifndef HORIZONTALSCROLL_H -#define HORIZONTALSCROLL_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula la rueda del ratón. - * - * @~english - * Emulates the mouse whell. - */ -class HorizontalScroll : public Action { - - private: - - /** - * @~spanish - * Velocidad del scroll. A mayor más lento. - * - * @~english - * Scroll speed. More is slower. - */ - int speed; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia la izquierda. - * - * @~english - * Accumulated space to scrolling left. - */ - int leftScrollSpace; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia derecha. - * - * @~english - * Accumulated space to scrolling right. - */ - int rightScrollSpace; - - public: - - HorizontalScroll(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // HORIZONTALSCROLL_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp touchegg-1.0/src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp 2011-03-30 21:49:44.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp 2011-07-12 13:07:02.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class MaximizeRestoreWindow - * @author José Expósito */ #include "MaximizeRestoreWindow.h" @@ -18,7 +24,8 @@ // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // -MaximizeRestoreWindow::MaximizeRestoreWindow(const QString& settings, Window window) +MaximizeRestoreWindow::MaximizeRestoreWindow(const QString& settings, + Window window) : Action(settings, window) {} @@ -30,7 +37,8 @@ void MaximizeRestoreWindow::executeUpdate(const QHash&) {} -void MaximizeRestoreWindow::executeFinish(const QHash&) { +void MaximizeRestoreWindow::executeFinish(const QHash&) +{ Atom atomMaxVert = XInternAtom(QX11Info::display(), "_NET_WM_STATE_MAXIMIZED_VERT", false); Atom atomMaxHorz = XInternAtom(QX11Info::display(), @@ -61,7 +69,7 @@ // Si la ventana está maximizada la restauramos XClientMessageEvent event; - event.window =this-> window; + event.window = this-> window; event.type = ClientMessage; event.message_type = XInternAtom(QX11Info::display(), "_NET_WM_STATE", false); diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MaximizeRestoreWindow.h touchegg-1.0/src/touchegg/actions/implementation/MaximizeRestoreWindow.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/MaximizeRestoreWindow.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MaximizeRestoreWindow.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MaximizeRestoreWindow.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class MaximizeRestoreWindow - * @author José Expósito */ #ifndef MAXIMIZERESTOREWINDOW_H #define MAXIMIZERESTOREWINDOW_H @@ -25,17 +31,18 @@ * @~english * Maximizes active window. */ -class MaximizeRestoreWindow : public Action { +class MaximizeRestoreWindow : public Action +{ - public: +public: - MaximizeRestoreWindow(const QString& settings, Window window); + MaximizeRestoreWindow(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // MAXIMIZERESTOREWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MinimizeWindow.cpp touchegg-1.0/src/touchegg/actions/implementation/MinimizeWindow.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/MinimizeWindow.cpp 2011-03-30 21:50:07.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MinimizeWindow.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MinimizeWindow.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class MinimizeWindow - * @author José Expósito */ #include "MinimizeWindow.h" @@ -30,7 +36,8 @@ void MinimizeWindow::executeUpdate(const QHash& /*attrs*/) {} -void MinimizeWindow::executeFinish(const QHash& /*attrs*/) { +void MinimizeWindow::executeFinish(const QHash& /*attrs*/) +{ // Minimizamos la ventana XClientMessageEvent event; event.window = this->window; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MinimizeWindow.h touchegg-1.0/src/touchegg/actions/implementation/MinimizeWindow.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/MinimizeWindow.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MinimizeWindow.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MinimizeWindow.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class MinimizeWindow - * @author José Expósito */ #ifndef MINIMIZEWINDOW_H #define MINIMIZEWINDOW_H @@ -25,17 +31,18 @@ * @~english * Minimizes active window. */ -class MinimizeWindow : public Action { +class MinimizeWindow : public Action +{ - public: +public: - MinimizeWindow(const QString& settings, Window window); + MinimizeWindow(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // MINIMIZEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MouseClick.cpp touchegg-1.0/src/touchegg/actions/implementation/MouseClick.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/MouseClick.cpp 2011-04-13 09:16:08.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MouseClick.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MouseClick.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class MouseClick - * @author José Expósito */ #include "MouseClick.h" @@ -19,7 +25,8 @@ // ************************************************************************** // MouseClick::MouseClick(const QString& settings, Window window) - : Action(settings, window) { + : Action(settings, window) +{ this->button = 1; QStringList strl = settings.split("="); @@ -44,9 +51,10 @@ void MouseClick::executeStart(const QHash& /*attrs*/) {} -void MouseClick::executeFinish(const QHash& /*attrs*/){} +void MouseClick::executeUpdate(const QHash& /*attrs*/) {} -void MouseClick::executeUpdate(const QHash& /*attrs*/) { +void MouseClick::executeFinish(const QHash& /*attrs*/) +{ XTestFakeButtonEvent(QX11Info::display(), this->button, true, 0); XTestFakeButtonEvent(QX11Info::display(), this->button, false, 0); XFlush(QX11Info::display()); diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MouseClick.h touchegg-1.0/src/touchegg/actions/implementation/MouseClick.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/MouseClick.h 2011-04-13 08:55:13.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MouseClick.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MouseClick.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class MouseClick - * @author José Expósito */ #ifndef LEFTBUTTONCLICK_H #define LEFTBUTTONCLICK_H @@ -25,28 +31,29 @@ * @~english * Emulates a click with the mouse. */ -class MouseClick : public Action { +class MouseClick : public Action +{ - private: +private: - /** - * @~spanish - * Botón a emular. - * - * @~english - * Button to emulate. - */ - int button; + /** + * @~spanish + * Botón a emular. + * + * @~english + * Button to emulate. + */ + int button; - public: +public: - MouseClick(const QString& settings, Window window); + MouseClick(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // LEFTBUTTONCLICK_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MoveWindow.cpp touchegg-1.0/src/touchegg/actions/implementation/MoveWindow.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/MoveWindow.cpp 2011-03-31 01:24:17.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MoveWindow.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MoveWindow.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class MoveWindow - * @author José Expósito */ #include "MoveWindow.h" @@ -26,14 +32,16 @@ // ********** PUBLIC METHODS ********** // // ************************************************************************** // -void MoveWindow::executeStart(const QHash& /*attrs*/) { +void MoveWindow::executeStart(const QHash& /*attrs*/) +{ XTestFakeKeyEvent(QX11Info::display(), XKeysymToKeycode(QX11Info::display(), XK_Alt_L), true, 0); XTestFakeButtonEvent(QX11Info::display(), Button1, true, 0); XFlush(QX11Info::display()); } -void MoveWindow::executeUpdate(const QHash& attrs) { +void MoveWindow::executeUpdate(const QHash& attrs) +{ if(!attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_X) || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_Y)) return; @@ -45,7 +53,8 @@ XFlush(QX11Info::display()); } -void MoveWindow::executeFinish(const QHash& /*attrs*/) { +void MoveWindow::executeFinish(const QHash& /*attrs*/) +{ XTestFakeKeyEvent(QX11Info::display(), XKeysymToKeycode(QX11Info::display(), XK_Alt_L), false, 0); XTestFakeButtonEvent(QX11Info::display(), Button1, false, 0); diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/MoveWindow.h touchegg-1.0/src/touchegg/actions/implementation/MoveWindow.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/MoveWindow.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/MoveWindow.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/MoveWindow.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class MoveWindow - * @author José Expósito */ #ifndef MOVEWINDOW_H #define MOVEWINDOW_H @@ -25,17 +31,18 @@ * @~english * Moves the window under cursor. */ -class MoveWindow : public Action { +class MoveWindow : public Action +{ - public: +public: - MoveWindow(const QString& settings, Window window); + MoveWindow(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // MOVEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ResizeWindow.cpp touchegg-1.0/src/touchegg/actions/implementation/ResizeWindow.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/ResizeWindow.cpp 2011-03-30 22:05:48.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ResizeWindow.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ResizeWindow.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ResizeWindow - * @author José Expósito */ #include "ResizeWindow.h" @@ -26,7 +32,8 @@ // ********** PUBLIC METHODS ********** // // ************************************************************************** // -void ResizeWindow::executeStart(const QHash& /*attrs*/) { +void ResizeWindow::executeStart(const QHash& /*attrs*/) +{ // Vemos si la ventana a redimensionar es especial (para no hacerlo) Atom atomRet; int size; @@ -52,7 +59,8 @@ } } -void ResizeWindow::executeUpdate(const QHash& attrs) { +void ResizeWindow::executeUpdate(const QHash& attrs) +{ if(this->window == 0) return; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ResizeWindow.h touchegg-1.0/src/touchegg/actions/implementation/ResizeWindow.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/ResizeWindow.h 2011-03-30 21:51:18.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ResizeWindow.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ResizeWindow.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class ResizeWindow - * @author José Expósito */ #ifndef RESIZEWINDOW_H #define RESIZEWINDOW_H @@ -25,17 +31,18 @@ * @~english * Resizes active window. */ -class ResizeWindow : public Action { +class ResizeWindow : public Action +{ - public: +public: - ResizeWindow(const QString& settings, Window window); + ResizeWindow(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/RunCommand.cpp touchegg-1.0/src/touchegg/actions/implementation/RunCommand.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/RunCommand.cpp 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/RunCommand.cpp 2011-07-12 14:29:01.000000000 +0000 @@ -1,33 +1,33 @@ /** * @file /src/touchegg/actions/implementation/RunCommand.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class RunCommand - * @author José Expósito */ #include "RunCommand.h" - // ************************************************************************** // // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // RunCommand::RunCommand(const QString& settings, Window window) - : Action(settings, window) { - this->command = ""; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "COMMAND") - this->command = strl.at(1); - else - qWarning() << "Error reading RUN_COMMAND settings"; + : Action(settings, window) +{ + this->command = settings; } @@ -39,7 +39,8 @@ void RunCommand::executeUpdate(const QHash& /*attrs*/) {} -void RunCommand::executeFinish(const QHash& /*attrs*/) { +void RunCommand::executeFinish(const QHash& /*attrs*/) +{ if(this->command != "") { QProcess* myProcess = new QProcess(); myProcess->startDetached(this->command); diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/RunCommand.h touchegg-1.0/src/touchegg/actions/implementation/RunCommand.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/RunCommand.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/RunCommand.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/RunCommand.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class RunCommand - * @author José Expósito */ #ifndef RUNCOMMAND_H @@ -26,28 +32,29 @@ * @~english * Runs the command specified in the configuration. */ -class RunCommand : public Action { +class RunCommand : public Action +{ - private: +private: - /** - * @~spanish - * Comando a ejecutar. - * - * @~english - * Command to execute. - */ - QString command; + /** + * @~spanish + * Comando a ejecutar. + * + * @~english + * Command to execute. + */ + QString command; - public: +public: - RunCommand(const QString& settings, Window window); + RunCommand(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // RUNCOMMAND_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/Scroll.cpp touchegg-1.0/src/touchegg/actions/implementation/Scroll.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/Scroll.cpp 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/Scroll.cpp 2011-07-12 17:27:32.000000000 +0000 @@ -0,0 +1,143 @@ +/** + * @file /src/touchegg/actions/implementation/Scroll.cpp + * + * This file is part of Touchégg. + * + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 + * @class Scroll + */ +#include "Scroll.h" + +// ************************************************************************** // +// ********** CONSTRUCTORS AND DESTRUCTOR ********** // +// ************************************************************************** // + +Scroll::Scroll(const QString& settings, Window window) + : Action(settings, window) +{ + this->upScrollSpace = 0; + this->downScrollSpace = 0; + this->rightScrollSpace = 0; + this->leftScrollSpace = 0; + this->verticalSpeed = 30; + this->horizontalSpeed = 30; + this->buttonUp = 4; + this->buttonDown = 5; + this->buttonLeft = 6; + this->buttonRight = 7; + + bool error = false; + + QStringList mainStr = settings.split(":"); + if(mainStr.length() != 2) + error = true; + + // Speed + QStringList mainStrSpeed = ((QString)mainStr.at(0)).split("="); + if(!error && mainStrSpeed.length() == 2 && mainStrSpeed.at(0) == "SPEED") { + bool ok; + int configSpeed = QString(mainStrSpeed.at(1)).toInt(&ok); + if(ok && configSpeed >= 1 && configSpeed <= 10) { + this->verticalSpeed = 40 - 2*configSpeed; + this->horizontalSpeed = 40 - 2*configSpeed; + } else { + error = true; + } + } else { + error = true; + } + + // Inverted + QStringList mainStrInv = mainStr.at(1).split("="); + if(!error && mainStrInv.length() == 2 && mainStrInv.at(0) == "INVERTED") { + if(mainStrInv.at(1) == "true") { + this->buttonUp = 5; + this->buttonDown = 4; + this->buttonLeft = 7; + this->buttonRight = 6; + } + } else { + error = true; + } + + + if(error) { + qWarning() << "Error reading SCROLL settings, using" + << "the default settings"; + } +} + + +// ************************************************************************** // +// ********** PUBLIC METHODS ********** // +// ************************************************************************** // + +void Scroll::executeStart(const QHash& /*attrs*/) {} + +void Scroll::executeUpdate(const QHash& attrs) +{ + float deltaX = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat(); + float deltaY = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat(); + + // Vertical scroll + if(deltaY > 0) { + this->downScrollSpace += (int)deltaY; + + while(this->downScrollSpace >= this->verticalSpeed) { + this->downScrollSpace -= this->verticalSpeed; + + XTestFakeButtonEvent(QX11Info::display(), this->buttonDown,true, 0); + XTestFakeButtonEvent(QX11Info::display(), this->buttonDown,false,0); + XFlush(QX11Info::display()); + } + + } else { + this->upScrollSpace -= (int)deltaY; + + while(this->upScrollSpace >= this->verticalSpeed) { + this->upScrollSpace -= this->verticalSpeed; + + XTestFakeButtonEvent(QX11Info::display(), this->buttonUp, true, 0); + XTestFakeButtonEvent(QX11Info::display(), this->buttonUp, false, 0); + XFlush(QX11Info::display()); + } + } + + // Horizontal scroll + if(deltaX > 0) { + this->rightScrollSpace += (int)deltaX; + + while(this->rightScrollSpace >= this->horizontalSpeed) { + this->rightScrollSpace -= this->horizontalSpeed; + + XTestFakeButtonEvent(QX11Info::display(),this->buttonRight,true,0); + XTestFakeButtonEvent(QX11Info::display(),this->buttonRight,false,0); + XFlush(QX11Info::display()); + } + + } else { + this->leftScrollSpace -= (int)deltaX; + + while(this->leftScrollSpace >= this->horizontalSpeed) { + this->leftScrollSpace -= this->horizontalSpeed; + + XTestFakeButtonEvent(QX11Info::display(), this->buttonLeft,true, 0); + XTestFakeButtonEvent(QX11Info::display(), this->buttonLeft,false,0); + XFlush(QX11Info::display()); + } + } +} + +void Scroll::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/Scroll.h touchegg-1.0/src/touchegg/actions/implementation/Scroll.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/Scroll.h 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/Scroll.h 2011-07-11 07:06:49.000000000 +0000 @@ -0,0 +1,144 @@ +/** + * @file /src/touchegg/actions/implementation/Scroll.h + * + * This file is part of Touchégg. + * + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 + * @class Scroll + */ +#ifndef SCROLL_H +#define SCROLL_H + +#include "src/touchegg/util/Include.h" +#include "src/touchegg/actions/implementation/Action.h" + +/** + * @~spanish + * Emula la rueda del ratón. + * + * @~english + * Emulates the mouse whell. + */ +class Scroll : public Action +{ + +private: + + /** + * @~spanish + * Velocidad del scroll. A mayor más lento. + * + * @~english + * Scroll speed. More is slower. + */ + int horizontalSpeed; + + /** + * @~spanish + * Velocidad del scroll. A mayor más lento. + * + * @~english + * Scroll speed. More is slower. + */ + int verticalSpeed; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Desplazamiento acumulado al hacer scroll hacia arriba. + * + * @~english + * Accumulated space to scrolling up. + */ + int upScrollSpace; + + /** + * @~spanish + * Desplazamiento acumulado al hacer scroll hacia abajo. + * + * @~english + * Accumulated space to scrolling down. + */ + int downScrollSpace; + + /** + * @~spanish + * Desplazamiento acumulado al hacer scroll hacia la izquierda. + * + * @~english + * Accumulated space to scrolling left. + */ + int leftScrollSpace; + + /** + * @~spanish + * Desplazamiento acumulado al hacer scroll hacia derecha. + * + * @~english + * Accumulated space to scrolling right. + */ + int rightScrollSpace; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Botón del ratón para hacer scroll hacia arriba. + * + * @~english + * Button of the mouse to scroll up. + */ + int buttonUp; + + /** + * @~spanish + * Botón del ratón para hacer scroll hacia abajo. + * + * @~english + * Button of the mouse to scroll down. + */ + int buttonDown; + + /** + * @~spanish + * Botón del ratón para hacer scroll hacia la izquierda. + * + * @~english + * Button of the mouse to scroll left. + */ + int buttonLeft; + + /** + * @~spanish + * Botón del ratón para hacer scroll hacia la derecha. + * + * @~english + * Button of the mouse to scroll right. + */ + int buttonRight; + +public: + + Scroll(const QString& settings, Window window); + + void executeStart(const QHash& attrs); + + void executeUpdate(const QHash& attrs); + + void executeFinish(const QHash& attrs); +}; + +#endif // SCROLL_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/SendKeys.cpp touchegg-1.0/src/touchegg/actions/implementation/SendKeys.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/SendKeys.cpp 2011-04-12 15:50:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/SendKeys.cpp 2011-07-14 12:32:45.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/SendKeys.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class SendKeys - * @author José Expósito */ #include "SendKeys.h" @@ -19,51 +25,49 @@ // ************************************************************************** // SendKeys::SendKeys(const QString& settings, Window window) - : Action(settings, window) { - qDebug() << settings; - - if(settings.split(":").length() != 2) { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } - - QString allHoldDown = settings.split(":").at(0); - QString allBetween = settings.split(":").at(1); - - if(allHoldDown.split("=").length() != 2 - || allBetween.split("=").length() != 2) { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } - - if(allHoldDown.split("=").at(0) != "HOLD_DOWN" - || allBetween.split("=").at(0) != "PRESS") { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } + : Action(settings, window) +{ + // Leemos las teclas a enviar desde la configuración + QStringList keys = settings.split("+"); + + foreach(QString key, keys) { + if(key == "Control" || key == "Shift" || key == "Super" + || key == "Alt") { + key = key.append("_L"); + KeySym keySym = XStringToKeysym(key.toStdString().c_str()); + KeyCode keyCode = XKeysymToKeycode(QX11Info::display(), keySym); + this->holdDownKeys.append(keyCode); - QString holdDownStr = allHoldDown.split("=").at(1); - QString betweenStr = allBetween.split("=").at(1); - QStringList holdDownList = holdDownStr.split("|"); - QStringList betweenList = betweenStr.split("|"); - - for(int n=0; nholdDownKeys.append(keyCode); - } - } - for(int n=0; npressBetweenKeys.append(keyCode); } } + + // Traemos al frente la ventana bajo el cursor, ya que solo se pueden enviar + // teclas a la ventana activa + XClientMessageEvent event; + event.window = this-> window; + event.type = ClientMessage; + event.message_type = XInternAtom(QX11Info::display(), "_NET_ACTIVE_WINDOW", + false); + event.format = 32; + event.data.l[0] = 2; + event.data.l[1] = CurrentTime; + event.data.l[2] = 0; + + XSendEvent(QX11Info::display(), + QX11Info::appRootWindow(QX11Info::appScreen()), false, + (SubstructureNotifyMask | SubstructureRedirectMask), + (XEvent*)&event); + + XFlush(QX11Info::display()); } @@ -75,7 +79,8 @@ void SendKeys::executeUpdate(const QHash& /*attrs*/) {} -void SendKeys::executeFinish(const QHash& /*attrs*/) { +void SendKeys::executeFinish(const QHash& /*attrs*/) +{ for(int n=0; nholdDownKeys.length(); n++) { XTestFakeKeyEvent(QX11Info::display(),this->holdDownKeys.at(n),true,0); diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/SendKeys.h touchegg-1.0/src/touchegg/actions/implementation/SendKeys.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/SendKeys.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/SendKeys.h 2011-07-12 12:32:27.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/SendKeys.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class SendKeys - * @author José Expósito */ #ifndef SENDKEYS_H #define SENDKEYS_H @@ -20,42 +26,43 @@ /** * @~spanish - * Envía las teclas indicadas en la configuración a la ventana activa. + * Envía las teclas indicadas en la configuración a la ventana bajo el cursor. * * @~english - * Envía las teclas indicadas en la configuración a la ventana activa. + * Sends the keys indicated in the configuration to the window under the cursor. */ -class SendKeys : public Action { - - private: - - /** - * @~spanish - * Teclas a mantener pulsadas mientras se envían el resto de teclas. - * - * @~english - * Keys to hold down while sending the rest of keys. - */ - QList holdDownKeys; +class SendKeys : public Action +{ - /** - * @~spanish - * Teclas a enviar mientras se mantienen pulsadas las holdDownKeys. - * - * @~english - * Keys to send while holdDownKeys are sending. - */ - QList pressBetweenKeys; +private: - public: + /** + * @~spanish + * Teclas a mantener pulsadas mientras se envían el resto de teclas. + * + * @~english + * Keys to hold down while sending the rest of keys. + */ + QList holdDownKeys; + + /** + * @~spanish + * Teclas a enviar mientras se mantienen pulsadas las holdDownKeys. + * + * @~english + * Keys to send while holdDownKeys are sending. + */ + QList pressBetweenKeys; + +public: - SendKeys(const QString& settings, Window window); + SendKeys(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // SENDKEYS_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ShowDesktop.cpp touchegg-1.0/src/touchegg/actions/implementation/ShowDesktop.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/ShowDesktop.cpp 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ShowDesktop.cpp 2011-07-11 06:33:23.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ShowDesktop.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ShowDesktop - * @author José Expósito */ #include "ShowDesktop.h" @@ -30,7 +36,8 @@ void ShowDesktop::executeUpdate(const QHash& /*attrs*/) {} -void ShowDesktop::executeFinish(const QHash& /*attrs*/) { +void ShowDesktop::executeFinish(const QHash& /*attrs*/) +{ // Vemos si ya se está en modo show desktop Atom atomRet; int size; diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/ShowDesktop.h touchegg-1.0/src/touchegg/actions/implementation/ShowDesktop.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/ShowDesktop.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/ShowDesktop.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/actions/implementation/ShowDesktop.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class ShowDesktop - * @author José Expósito */ #ifndef SHOWDESKTOP_H #define SHOWDESKTOP_H @@ -25,17 +31,18 @@ * @~english * Shows the desktop. */ -class ShowDesktop : public Action { +class ShowDesktop : public Action +{ - public: +public: - ShowDesktop(const QString& settings, Window window); + ShowDesktop(const QString& settings, Window window); - void executeStart(const QHash& attrs); + void executeStart(const QHash& attrs); - void executeUpdate(const QHash& attrs); + void executeUpdate(const QHash& attrs); - void executeFinish(const QHash& attrs); + void executeFinish(const QHash& attrs); }; #endif // SHOWDESKTOP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/all-wcprops touchegg-1.0/src/touchegg/actions/implementation/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/all-wcprops 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 61 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/implementation -END -MoveWindow.h -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/MoveWindow.h -END -MouseClick.h -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/MouseClick.h -END -RunCommand.h -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/RunCommand.h -END -HorizontalScroll.cpp -K 25 -svn:wc:ra_dav:version-url -V 83 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/HorizontalScroll.cpp -END -MinimizeWindow.h -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/MinimizeWindow.h -END -ShowDesktop.h -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/ShowDesktop.h -END -ChangeDesktop.cpp -K 25 -svn:wc:ra_dav:version-url -V 80 -/svn/!svn/ver/106/touchegg/src/touchegg/actions/implementation/ChangeDesktop.cpp -END -MaximizeRestoreWindow.h -K 25 -svn:wc:ra_dav:version-url -V 86 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/MaximizeRestoreWindow.h -END -DragAndDrop.cpp -K 25 -svn:wc:ra_dav:version-url -V 78 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/DragAndDrop.cpp -END -ChangeViewport.cpp -K 25 -svn:wc:ra_dav:version-url -V 81 -/svn/!svn/ver/106/touchegg/src/touchegg/actions/implementation/ChangeViewport.cpp -END -SendKeys.h -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/SendKeys.h -END -actions.implementation.pri -K 25 -svn:wc:ra_dav:version-url -V 89 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/actions.implementation.pri -END -VerticalScroll.h -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/VerticalScroll.h -END -ResizeWindow.h -K 25 -svn:wc:ra_dav:version-url -V 77 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/ResizeWindow.h -END -MoveWindow.cpp -K 25 -svn:wc:ra_dav:version-url -V 77 -/svn/!svn/ver/103/touchegg/src/touchegg/actions/implementation/MoveWindow.cpp -END -MouseClick.cpp -K 25 -svn:wc:ra_dav:version-url -V 77 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/MouseClick.cpp -END -CloseWindow.h -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/CloseWindow.h -END -RunCommand.cpp -K 25 -svn:wc:ra_dav:version-url -V 77 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/RunCommand.cpp -END -MinimizeWindow.cpp -K 25 -svn:wc:ra_dav:version-url -V 81 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/MinimizeWindow.cpp -END -ShowDesktop.cpp -K 25 -svn:wc:ra_dav:version-url -V 78 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/ShowDesktop.cpp -END -HorizontalScroll.h -K 25 -svn:wc:ra_dav:version-url -V 81 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/HorizontalScroll.h -END -MaximizeRestoreWindow.cpp -K 25 -svn:wc:ra_dav:version-url -V 88 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp -END -Action.h -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/Action.h -END -ChangeDesktop.h -K 25 -svn:wc:ra_dav:version-url -V 78 -/svn/!svn/ver/106/touchegg/src/touchegg/actions/implementation/ChangeDesktop.h -END -SendKeys.cpp -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/107/touchegg/src/touchegg/actions/implementation/SendKeys.cpp -END -VerticalScroll.cpp -K 25 -svn:wc:ra_dav:version-url -V 81 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/VerticalScroll.cpp -END -ResizeWindow.cpp -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/ResizeWindow.cpp -END -DragAndDrop.h -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/implementation/DragAndDrop.h -END -ChangeViewport.h -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/106/touchegg/src/touchegg/actions/implementation/ChangeViewport.h -END -CloseWindow.cpp -K 25 -svn:wc:ra_dav:version-url -V 78 -/svn/!svn/ver/102/touchegg/src/touchegg/actions/implementation/CloseWindow.cpp -END diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/entries touchegg-1.0/src/touchegg/actions/implementation/.svn/entries --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/entries 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,1336 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/actions/implementation -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -MoveWindow.h -file -102 - - - -2011-03-30T21:46:00.577546Z -5821d6680bbeeca8bb934c77c7848b23 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1002 - -MouseClick.h -file -108 - - - -2011-04-13T08:55:13.850013Z -1910dbae198345e3e9684098e66a7da9 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1186 - -MiddleButtonClick.h -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -RunCommand.h -file -102 - - - -2011-03-30T21:46:00.577546Z -75096832db9662f8a5c158005dfae272 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1217 - -HorizontalScroll.cpp -file -102 - - - -2011-03-30T21:46:00.577546Z -3a79e48590622349cf4a6d09a4355715 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2745 - -MouseWheelDown.h -file -98 - - - - - - - - - - - - - - - - - - - -deleted - -MinimizeWindow.h -file -102 - - - -2011-03-30T21:46:00.569546Z -a4c5882a8fdfee52f4979704f7c41070 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1019 - -ShowDesktop.h -file -102 - - - -2011-03-30T21:46:00.573546Z -e5882b0c5a8cbe08eee0e9b96fe5d28a -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -987 - -ChangeDesktop.cpp -file -106 - - - -2011-04-11T16:55:30.128246Z -da9c8222025aa88abbb645b274dd7147 -2011-04-11T16:59:46.579716Z -106 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3414 - -MouseWheelUp.cpp -file -98 - - - - - - - - - - - - - - - - - - - -deleted - -MaximizeRestoreWindow.h -file -102 - - - -2011-03-30T21:46:00.573546Z -54ab4657ade50923bc4e4b69d54892a0 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1068 - -MouseMove.h -file -107 - - - - - - - - - - - - - - - - - - - -deleted - -RightButtonClick.h -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -DragAndDrop.cpp -file -108 - - - -2011-04-13T09:21:53.775438Z -cb55eb9036caee54eed626f45cb63f02 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2269 - -ChangeViewport.cpp -file -106 - - - -2011-04-11T16:53:25.664617Z -cce069306fe65ceba15aad17f10ea12f -2011-04-11T16:59:46.579716Z -106 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -4234 - -SendKeys.h -file -102 - - - -2011-03-30T21:46:00.577546Z -aec2cc5beedddc4f8f6dcce29aedd814 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1583 - -actions.implementation.pri -file -108 - - - -2011-04-13T08:53:01.784079Z -0b03b37d1a582df92584cfae25187d60 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1713 - -VerticalScroll.h -file -102 - - - -2011-03-30T21:46:00.573546Z -77c7301f1f404273e0c0883f9af187f3 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1661 - -ResizeWindow.h -file -102 - - - -2011-03-30T21:51:18.761546Z -286a6434ffd079730ff4dda7be153385 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1008 - -MoveWindow.cpp -file -103 - - - -2011-03-31T01:24:17.000000Z -56fa21f2df308a01e129f92e680f6218 -2011-04-07T00:14:43.841574Z -103 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2066 - -MouseClick.cpp -file -108 - - - -2011-04-13T09:16:08.383438Z -391d13a5a9ae70c2583746bddec0143d -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1950 - -MiddleButtonClick.cpp -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -LeftButtonClick.h -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -CloseWindow.h -file -102 - - - -2011-03-30T21:46:02.933546Z -135b24c7116c646e85ccea68b839e569 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -997 - -RunCommand.cpp -file -102 - - - -2011-03-30T21:46:00.561546Z -8b100633e321553127a5bac16a9546d7 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1629 - -MouseWheelDown.cpp -file -98 - - - - - - - - - - - - - - - - - - - -deleted - -MinimizeWindow.cpp -file -102 - - - -2011-03-30T21:50:07.377546Z -121ea24cecc61f9276f904620115dab7 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1813 - -ShowDesktop.cpp -file -102 - - - -2011-03-30T21:46:00.577546Z -e0a65c94816418efe68716b904bb4e8a -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2377 - -HorizontalScroll.h -file -102 - - - -2011-03-30T21:46:00.561546Z -d6bd247f5bea0c8f8f03fa8ccb5ee957 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1689 - -MouseMove.cpp -file -107 - - - - - - - - - - - - - - - - - - - -deleted - -MaximizeRestoreWindow.cpp -file -102 - - - -2011-03-30T21:49:44.029546Z -fa90cc22777d5addfd06aa142c45b98a -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2887 - -RightButtonClick.cpp -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -Action.h -file -108 - - - -2011-04-13T10:01:34.983438Z -10cbb9c9a78d7a7a459c61188e59c939 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3888 - -ChangeDesktop.h -file -106 - - - -2011-04-11T09:26:33.816003Z -a2efc3b31ea87d217880a76616258075 -2011-04-11T16:59:46.579716Z -106 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1211 - -SendKeys.cpp -file -107 - - - -2011-04-12T15:50:10.213532Z -a541602a487251d3c009e6417e6e5c8c -2011-04-12T16:34:21.446110Z -107 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3364 - -MouseWheelUp.h -file -98 - - - - - - - - - - - - - - - - - - - -deleted - -VerticalScroll.cpp -file -102 - - - -2011-03-30T21:46:00.569546Z -7c6ed28b7ee2ad38a58aaf07dc00e069 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2737 - -ResizeWindow.cpp -file -102 - - - -2011-03-30T22:05:48.421546Z -c3e6e23d4fea511cf2c132b018c33969 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3546 - -DragAndDrop.h -file -108 - - - -2011-04-13T09:21:53.775438Z -ae93c3ee6cc2c8edd387e4b7fa76fd7f -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1197 - -ChangeViewport.h -file -106 - - - -2011-04-11T09:32:47.488348Z -71dd8c6c92c2c4aeb57b4b4855a24c32 -2011-04-11T16:59:46.579716Z -106 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1213 - -LeftButtonClick.cpp -file -108 - - - - - - - - - - - - - - - - - - - -deleted - -CloseWindow.cpp -file -102 - - - -2011-03-30T21:47:25.281546Z -1cd28e48b7bec4ff551773f4823aa178 -2011-03-30T22:12:22.346295Z -102 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1814 - diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/Action.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/Action.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/Action.h.svn-base 2011-04-13 10:11:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/Action.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/Action.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Action - * @author José Expósito - */ -#ifndef ACTION_H -#define ACTION_H - -#include "src/touchegg/util/Include.h" - - -/** - * @~spanish - * Clase de la que deben heredar todas las acciones. Las acciones son - * operaciones asociadas a un gesto que se ejecutarán cuando dicho gesto se - * capture. - * - * @~english - * Class that should inherit all actions. Actions are operations associated with - * a gesture that will be executed when this gesture is caught. - */ -class Action { - - protected: - - /** - * @~spanish - * Configuración de la acción. - * - * @~english - * Action settings. - */ - QString settings; - - /** - * @~spanish - * Ventana sobre la que se realiza la acción. - * - * @~english - * Window on which execute the action. - */ - Window window; - - public: - - /** - * @~spanish - * Constructor. - * @param settings Configuración del gesto. - * @param window Ventana sobre la que se realiza el gesto. - * - * @~english - * Constructor. - * @param settings Gesture settings. - * @param window Window on which execute the action. - */ - Action(const QString& settings, Window window) { - this->settings = settings; - this->window = window; - } - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se inicie. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture is started. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeStart(const QHash& attrs) = 0; - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se actualice. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture is updated. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeUpdate(const QHash& attrs) = 0; - - /** - * @~spanish - * Parte de la acción que se ejecutará cuando el gesto se finalice. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Part of the action that will be executed when the gesture finish. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - virtual void executeFinish(const QHash& attrs) = 0; - -}; - -#endif // ACTION_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/actions.implementation.pri.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/actions.implementation.pri.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/actions.implementation.pri.svn-base 2011-04-13 10:11:27.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/actions.implementation.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ - -HEADERS += \ - src/touchegg/actions/implementation/Action.h \ - src/touchegg/actions/implementation/MinimizeWindow.h \ - src/touchegg/actions/implementation/CloseWindow.h \ - src/touchegg/actions/implementation/MaximizeRestoreWindow.h \ - src/touchegg/actions/implementation/ShowDesktop.h \ - src/touchegg/actions/implementation/SendKeys.h \ - src/touchegg/actions/implementation/ChangeDesktop.h \ - src/touchegg/actions/implementation/ResizeWindow.h \ - src/touchegg/actions/implementation/MoveWindow.h \ - src/touchegg/actions/implementation/RunCommand.h \ - src/touchegg/actions/implementation/DragAndDrop.h \ - src/touchegg/actions/implementation/VerticalScroll.h \ - src/touchegg/actions/implementation/HorizontalScroll.h \ - src/touchegg/actions/implementation/ChangeViewport.h \ - src/touchegg/actions/implementation/MouseClick.h - -SOURCES += \ - src/touchegg/actions/implementation/MinimizeWindow.cpp \ - src/touchegg/actions/implementation/CloseWindow.cpp \ - src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp \ - src/touchegg/actions/implementation/ShowDesktop.cpp \ - src/touchegg/actions/implementation/SendKeys.cpp \ - src/touchegg/actions/implementation/ChangeDesktop.cpp \ - src/touchegg/actions/implementation/ResizeWindow.cpp \ - src/touchegg/actions/implementation/MoveWindow.cpp \ - src/touchegg/actions/implementation/RunCommand.cpp \ - src/touchegg/actions/implementation/DragAndDrop.cpp \ - src/touchegg/actions/implementation/VerticalScroll.cpp \ - src/touchegg/actions/implementation/HorizontalScroll.cpp \ - src/touchegg/actions/implementation/ChangeViewport.cpp \ - src/touchegg/actions/implementation/MouseClick.cpp diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.cpp.svn-base 2011-04-11 16:59:50.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ChangeDesktop.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ChangeDesktop - * @author José Expósito - */ -#include "ChangeDesktop.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -ChangeDesktop::ChangeDesktop(const QString& settings, Window window) - : Action(settings, window) { - this->toRight = true; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "DIRECTION") { - QString configDir = strl.at(1); - if(configDir == "PREVIOUS") - this->toRight = false; - else if(configDir == "NEXT") - this->toRight = true; - else - qWarning() << "Error reading CHANGE_DESKTOP settings, using " << - "the default settings"; - } else - qWarning() << "Error reading CHANGE_DESKTOP settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void ChangeDesktop::executeStart(const QHash& /*attrs*/) {} - -void ChangeDesktop::executeUpdate(const QHash& /*attrs*/) {} - -void ChangeDesktop::executeFinish(const QHash& /*attrs*/) { - // Obtenemos el número total de escritorios - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - - XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), - XInternAtom(QX11Info::display(), "_NET_NUMBER_OF_DESKTOPS", false), - 0, 1, false, XA_CARDINAL, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet); - int numDesktops = (int)*propRet; - XFree(propRet); - - // Obtenemos el escritorio actual - XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), - XInternAtom(QX11Info::display(), "_NET_CURRENT_DESKTOP", false), - 0, 1, false, XA_CARDINAL, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet); - int currentDesktop = (int)*propRet; - XFree(propRet); - - // Cambiamos al escritorio siguiente o anterior - int nextDesktop = this->toRight - ? (currentDesktop + 1) % numDesktops - : (currentDesktop - 1 + numDesktops) % numDesktops; - - XClientMessageEvent event; - event.window = QX11Info::appRootWindow(QX11Info::appScreen()); - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), - "_NET_CURRENT_DESKTOP", false); - event.format = 32; - event.data.l[0] = nextDesktop; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.h.svn-base 2011-04-11 16:59:50.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeDesktop.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ChangeDesktop.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ChangeDesktop - * @author José Expósito - */ -#ifndef CHANGEDESKTOP_H -#define CHANGEDESKTOP_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Cambia de escritorio. - * - * @~english - * Change the desktop. - */ -class ChangeDesktop : public Action { - - private: - - /** - * @~spanish - * Dirección en la que cambiar de escritorio. - * - * @~english - * Direction to switch desktops. - */ - bool toRight; - - public: - - ChangeDesktop(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // CHANGEDESKTOP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.cpp.svn-base 2011-04-11 16:59:51.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ChangeViewport.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ChangeViewport - * @author José Expósito - */ -#include "ChangeViewport.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -ChangeViewport::ChangeViewport(const QString& settings, Window window) - : Action(settings, window) { - this->next = true; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "DIRECTION") { - QString configDir = strl.at(1); - if(configDir == "PREVIOUS") - this->next = false; - else if(configDir == "NEXT") - this->next = true; - else - qWarning() << "Error reading CHANGE_VIEWPORT settings, using " << - "the default settings"; - } else - qWarning() << "Error reading CHANGE_VIEWPORT settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void ChangeViewport::executeStart(const QHash& /*attrs*/) {} - -void ChangeViewport::executeUpdate(const QHash& /*attrs*/) {} - -void ChangeViewport::executeFinish(const QHash& /*attrs*/) { - // Obtenemos el tamaño total de todos los viewports juntos - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - - int widthViews, heightViews; - if(XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), - XInternAtom(QX11Info::display(), "_NET_DESKTOP_GEOMETRY", false), - 0, 100, false, XA_CARDINAL, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet) == Success && numItems == 2) { - int* aux = (int*)propRet; - widthViews = aux[0]; - heightViews = aux[1]; - XFree(propRet); - } else { - return; - } - - // Obtenemos las coordenadas del viewport actual - int currentX, currentY; - if(XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), - XInternAtom(QX11Info::display(), "_NET_DESKTOP_VIEWPORT", false), - 0, 100, false, XA_CARDINAL, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet) == Success && numItems == 2) { - int* aux = (int*)propRet; - currentX = aux[0]; - currentY = aux[1]; - XFree(propRet); - } else { - return; - } - - // Obtenemos las coordenadas del viewport anterior/siguiente - int nextX, nextY; - if(this->next) { - nextX = (currentX + QApplication::desktop()->width()) % widthViews; - nextY = nextX == 0 - ? (currentY + QApplication::desktop()->height()) % heightViews - : currentY; - } else { - nextX = (currentX - QApplication::desktop()->width()) % widthViews; - if(nextX < 0) { - nextY = (currentY-QApplication::desktop()->height()) % heightViews; - nextX *= -1; - nextY *= -1; - } else { - nextY = currentY; - } - } - - // Cambiamos de viewport - XClientMessageEvent event; - event.window = QX11Info::appRootWindow(QX11Info::appScreen()); - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), - "_NET_DESKTOP_VIEWPORT", false); - event.format = 32; - event.data.l[0] = nextX; - event.data.l[1] = nextY; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.h.svn-base 2011-04-11 16:59:52.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ChangeViewport.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ChangeViewport.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ChangeDesktop - * @author José Expósito - */ -#ifndef CHANGEVIEWPORT_H -#define CHANGEVIEWPORT_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Cambia el viewport. - * - * @~english - * Change the viewport. - */ -class ChangeViewport : public Action { - - private: - - /** - * @~spanish - * Dirección en la que cambiar de escritorio. - * - * @~english - * Direction to switch desktops. - */ - bool next; - - public: - - ChangeViewport(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // CHANGEVIEWPORT_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.cpp.svn-base 2011-03-30 22:12:09.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/CloseWindow.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class CloseWindow - * @author José Expósito - */ -#include "CloseWindow.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -CloseWindow::CloseWindow(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void CloseWindow::executeStart(const QHash& /*attrs*/) {} - -void CloseWindow::executeUpdate(const QHash& /*attrs*/) {} - -void CloseWindow::executeFinish(const QHash& /*attrs*/) { - // Cerramos la ventana - XClientMessageEvent event; - event.window = this->window; - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), "_NET_CLOSE_WINDOW", - false); - event.format = 32; - event.data.l[0] = CurrentTime; - event.data.l[1] = 2; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.h.svn-base 2011-03-30 22:12:16.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/CloseWindow.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/CloseWindow.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class CloseWindow - * @author José Expósito - */ -#ifndef CLOSEWINDOW_H -#define CLOSEWINDOW_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Cierra la ventana activa. - * - * @~english - * Closes the active window. - */ -class CloseWindow : public Action { - - public: - - CloseWindow(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // CLOSEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.cpp.svn-base 2011-04-13 10:11:26.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/DragAndDrop.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class DragAndDrop - * @author José Expósito - */ -#include "DragAndDrop.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -DragAndDrop::DragAndDrop(const QString& settings, Window window) - : Action(settings, window) { - this->button = 1; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "BUTTON") { - bool ok = false; - int aux = strl.at(1).toInt(&ok); - - if(ok && aux>=1 && aux<=9) - this->button = aux; - else - qWarning() << "Error reading MOUSE_CLICK settings, using " << - "the default settings"; - } else - qWarning() << "Error reading MOUSE_CLICK settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void DragAndDrop::executeStart(const QHash& /*attrs*/) { - XTestFakeButtonEvent(QX11Info::display(), this->button, true, 0); -} - -void DragAndDrop::executeUpdate(const QHash& attrs) { - if(!attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_X) - || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_Y)) - return; - - QCursor::setPos(QCursor::pos().x() - + attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat(), - QCursor::pos().y() - + attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat()); -} - -void DragAndDrop::executeFinish(const QHash& /*attrs*/) { - XTestFakeButtonEvent(QX11Info::display(), this->button, false, 0); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.h.svn-base 2011-04-13 10:11:27.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/DragAndDrop.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/DragAndDrop.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class DragAndDrop - * @author José Expósito - */ -#ifndef DRAGANDDROP_H -#define DRAGANDDROP_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula drag and drop (click y arrastrar). - * - * @~english - * Emulates drag and drop (click and drag). - */ -class DragAndDrop : public Action { - - private: - - /** - * @~spanish - * Botón a emular. - * - * @~english - * Button to emulate. - */ - int button; - - public: - - DragAndDrop(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // DRAGANDDROP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.cpp.svn-base 2011-03-30 22:12:17.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/HorizontalScroll.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class HorizontalScroll - * @author José Expósito - */ -#include "HorizontalScroll.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -HorizontalScroll::HorizontalScroll(const QString& settings, Window window) - : Action(settings, window) { - this->leftScrollSpace = 0; - this->rightScrollSpace = 0; - this->speed = 30; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "SPEED") { - bool ok; - int configSpeed = QString(strl.at(1)).toInt(&ok); - if(ok && configSpeed >= 1 && configSpeed <= 10) - this->speed = 40 - 2*configSpeed; - else - qWarning() << "Error reading HORIZONTAL_SCROLL settings, using " << - "the default settings"; - } else - qWarning() << "Error reading HORIZONTAL_SCROLL settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void HorizontalScroll::executeStart(const QHash& /*attrs*/) {} - -void HorizontalScroll::executeUpdate(const QHash& attrs) { - float deltaX = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat(); - - if(deltaX > 0) { - this->rightScrollSpace += (int)deltaX; - - while(this->rightScrollSpace >= this->speed) { - this->rightScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), 7, true, 0); - XTestFakeButtonEvent(QX11Info::display(), 7, false, 0); - XFlush(QX11Info::display()); - } - - } else { - this->leftScrollSpace -= (int)deltaX; - - while(this->leftScrollSpace >= this->speed) { - this->leftScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), 6, true, 0); - XTestFakeButtonEvent(QX11Info::display(), 6, false, 0); - XFlush(QX11Info::display()); - } - } -} - -void HorizontalScroll::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.h.svn-base 2011-03-30 22:12:11.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/HorizontalScroll.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/HorizontalScroll.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class HorizontalScroll - * @author José Expósito - */ -#ifndef HORIZONTALSCROLL_H -#define HORIZONTALSCROLL_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula la rueda del ratón. - * - * @~english - * Emulates the mouse whell. - */ -class HorizontalScroll : public Action { - - private: - - /** - * @~spanish - * Velocidad del scroll. A mayor más lento. - * - * @~english - * Scroll speed. More is slower. - */ - int speed; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia la izquierda. - * - * @~english - * Accumulated space to scrolling left. - */ - int leftScrollSpace; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia derecha. - * - * @~english - * Accumulated space to scrolling right. - */ - int rightScrollSpace; - - public: - - HorizontalScroll(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // HORIZONTALSCROLL_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.cpp.svn-base 2011-03-30 22:12:06.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MaximizeRestoreWindow.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MaximizeRestoreWindow - * @author José Expósito - */ -#include "MaximizeRestoreWindow.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -MaximizeRestoreWindow::MaximizeRestoreWindow(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void MaximizeRestoreWindow::executeStart(const QHash&) {} - -void MaximizeRestoreWindow::executeUpdate(const QHash&) {} - -void MaximizeRestoreWindow::executeFinish(const QHash&) { - Atom atomMaxVert = XInternAtom(QX11Info::display(), - "_NET_WM_STATE_MAXIMIZED_VERT", false); - Atom atomMaxHorz = XInternAtom(QX11Info::display(), - "_NET_WM_STATE_MAXIMIZED_HORZ", false); - - // Vemos si la ventanan está maximizada - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - - XGetWindowProperty(QX11Info::display(), this->window, - XInternAtom(QX11Info::display(), "_NET_WM_STATE", false), - 0, 100, false, XA_ATOM, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet); - Atom* states = (Atom*)propRet; - - bool maxHor = false; - bool maxVert = false; - for(unsigned int n=0; n window; - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), "_NET_WM_STATE", - false); - event.format = 32; - event.data.l[0] = maximized ? 0 : 1; - event.data.l[1] = atomMaxVert; - event.data.l[2] = atomMaxHorz; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - - XFlush(QX11Info::display()); -} - diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.h.svn-base 2011-03-30 22:12:13.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MaximizeRestoreWindow.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MaximizeRestoreWindow.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MaximizeRestoreWindow - * @author José Expósito - */ -#ifndef MAXIMIZERESTOREWINDOW_H -#define MAXIMIZERESTOREWINDOW_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Maximiza la ventana activa. - * - * @~english - * Maximizes active window. - */ -class MaximizeRestoreWindow : public Action { - - public: - - MaximizeRestoreWindow(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // MAXIMIZERESTOREWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.cpp.svn-base 2011-03-30 22:12:11.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MinimizeWindow.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MinimizeWindow - * @author José Expósito - */ -#include "MinimizeWindow.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -MinimizeWindow::MinimizeWindow(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void MinimizeWindow::executeStart(const QHash& /*attrs*/) {} - -void MinimizeWindow::executeUpdate(const QHash& /*attrs*/) {} - -void MinimizeWindow::executeFinish(const QHash& /*attrs*/) { - // Minimizamos la ventana - XClientMessageEvent event; - event.window = this->window; - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), "WM_CHANGE_STATE", - false); - event.format = 32; - event.data.l[0] = IconicState; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.h.svn-base 2011-03-30 22:12:06.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MinimizeWindow.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MinimizeWindow.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MinimizeWindow - * @author José Expósito - */ -#ifndef MINIMIZEWINDOW_H -#define MINIMIZEWINDOW_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Minimiza la ventana activa. - * - * @~english - * Minimizes active window. - */ -class MinimizeWindow : public Action { - - public: - - MinimizeWindow(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // MINIMIZEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseButton.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseButton.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseButton.cpp.svn-base 2011-04-13 08:48:07.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseButton.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/LeftButtonClick.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class LeftButtonClick - * @author José Expósito - */ -#include "LeftButtonClick.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -LeftButtonClick::LeftButtonClick(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void LeftButtonClick::executeStart(const QHash& /*attrs*/) {} - -void LeftButtonClick::executeFinish(const QHash& /*attrs*/){} - -void LeftButtonClick::executeUpdate(const QHash& /*attrs*/) { - XTestFakeButtonEvent(QX11Info::display(), Button1, true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button1, false, 0); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseClick.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseClick.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseClick.cpp.svn-base 2011-04-13 10:11:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseClick.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MouseClick.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MouseClick - * @author José Expósito - */ -#include "MouseClick.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -MouseClick::MouseClick(const QString& settings, Window window) - : Action(settings, window) { - this->button = 1; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "BUTTON") { - bool ok = false; - int aux = strl.at(1).toInt(&ok); - - if(ok && aux>=1 && aux<=9) - this->button = aux; - else - qWarning() << "Error reading MOUSE_CLICK settings, using " << - "the default settings"; - } else - qWarning() << "Error reading MOUSE_CLICK settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void MouseClick::executeStart(const QHash& /*attrs*/) {} - -void MouseClick::executeFinish(const QHash& /*attrs*/){} - -void MouseClick::executeUpdate(const QHash& /*attrs*/) { - XTestFakeButtonEvent(QX11Info::display(), this->button, true, 0); - XTestFakeButtonEvent(QX11Info::display(), this->button, false, 0); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseClick.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseClick.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MouseClick.h.svn-base 2011-04-13 10:11:26.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MouseClick.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MouseClick.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MouseClick - * @author José Expósito - */ -#ifndef LEFTBUTTONCLICK_H -#define LEFTBUTTONCLICK_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula un click con el ratón. - * - * @~english - * Emulates a click with the mouse. - */ -class MouseClick : public Action { - - private: - - /** - * @~spanish - * Botón a emular. - * - * @~english - * Button to emulate. - */ - int button; - - public: - - MouseClick(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); - -}; -#endif // LEFTBUTTONCLICK_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.cpp.svn-base 2011-04-07 00:14:46.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MoveWindow.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MoveWindow - * @author José Expósito - */ -#include "MoveWindow.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -MoveWindow::MoveWindow(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void MoveWindow::executeStart(const QHash& /*attrs*/) { - XTestFakeKeyEvent(QX11Info::display(), - XKeysymToKeycode(QX11Info::display(), XK_Alt_L), true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button1, true, 0); - XFlush(QX11Info::display()); -} - -void MoveWindow::executeUpdate(const QHash& attrs) { - if(!attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_X) - || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_DELTA_Y)) - return; - - XTestFakeRelativeMotionEvent(QX11Info::display(), - + attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() * 2, - + attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() * 2, 0); - - XFlush(QX11Info::display()); -} - -void MoveWindow::executeFinish(const QHash& /*attrs*/) { - XTestFakeKeyEvent(QX11Info::display(), - XKeysymToKeycode(QX11Info::display(), XK_Alt_L), false, 0); - XTestFakeButtonEvent(QX11Info::display(), Button1, false, 0); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.h.svn-base 2011-03-30 22:12:16.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/MoveWindow.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/MoveWindow.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class MoveWindow - * @author José Expósito - */ -#ifndef MOVEWINDOW_H -#define MOVEWINDOW_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Mueve la ventana bajo el cursor. - * - * @~english - * Moves the window under cursor. - */ -class MoveWindow : public Action { - - public: - - MoveWindow(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // MOVEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.cpp.svn-base 2011-03-30 22:12:15.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ResizeWindow.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ResizeWindow - * @author José Expósito - */ -#include "ResizeWindow.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -ResizeWindow::ResizeWindow(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void ResizeWindow::executeStart(const QHash& /*attrs*/) { - // Vemos si la ventana a redimensionar es especial (para no hacerlo) - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - - if(XGetWindowProperty(QX11Info::display(), this->window, - XInternAtom(QX11Info::display(), "_NET_WM_WINDOW_TYPE", false), - 0, 100, false, XA_ATOM, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet) == Success) { - Atom* types = (Atom*)propRet; - Atom type = types[0]; // Solo miramos el primer tipo especificado - - if(type == XInternAtom(QX11Info::display(), - "_NET_WM_WINDOW_TYPE_DESKTOP", false) - || type == XInternAtom(QX11Info::display(), - "_NET_WM_WINDOW_TYPE_DOCK", false) - || type == XInternAtom(QX11Info::display(), - "_NET_WM_WINDOW_TYPE_SPLASH", false)) { - this->window = 0; - } - XFree(propRet); - } -} - -void ResizeWindow::executeUpdate(const QHash& attrs) { - if(this->window == 0) - return; - - // Ángulo - if(!attrs.contains(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1) - || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2) - || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1) - || !attrs.contains(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y2)) - return; - - float co = attrs.value(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y2).toFloat() - - attrs.value(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1).toFloat(); - float cc = attrs.value(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2).toFloat() - - attrs.value(GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1).toFloat(); - - double angle = (int)(atan(co/cc) * 100); - - double incX, incY; - if(angle > 75) { - incX = 0; - incY = 1; - } else if(angle < 20) { - incX = 1; - incY = 0; - } else { - incX = cos(angle * (3.14/180)); - incY = sin(angle * (3.14/180)); - } - - // Redimensionamos la ventana - XWindowAttributes xwa; - XGetWindowAttributes(QX11Info::display(), this->window, &xwa); - int inc = (int)attrs.value(GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA).toFloat()*3; - XResizeWindow(QX11Info::display(), this->window, - xwa.width + inc * incX, - xwa.height + inc * incY); - XFlush(QX11Info::display()); -} - -void ResizeWindow::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.h.svn-base 2011-03-30 22:12:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ResizeWindow.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ResizeWindow.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ResizeWindow - * @author José Expósito - */ -#ifndef RESIZEWINDOW_H -#define RESIZEWINDOW_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Redimensiona la ventana activa. - * - * @~english - * Resizes active window. - */ -class ResizeWindow : public Action { - - public: - - ResizeWindow(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); - -}; - -#endif // RESIZEWINDOW_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/RunCommand.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/RunCommand.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/RunCommand.cpp.svn-base 2011-03-30 22:12:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/RunCommand.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/RunCommand.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class RunCommand - * @author José Expósito - */ -#include "RunCommand.h" - - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -RunCommand::RunCommand(const QString& settings, Window window) - : Action(settings, window) { - this->command = ""; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "COMMAND") - this->command = strl.at(1); - else - qWarning() << "Error reading RUN_COMMAND settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void RunCommand::executeStart(const QHash& /*attrs*/) {} - -void RunCommand::executeUpdate(const QHash& /*attrs*/) {} - -void RunCommand::executeFinish(const QHash& /*attrs*/) { - if(this->command != "") { - QProcess* myProcess = new QProcess(); - myProcess->startDetached(this->command); - } -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/RunCommand.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/RunCommand.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/RunCommand.h.svn-base 2011-03-30 22:12:17.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/RunCommand.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/RunCommand.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class RunCommand - * @author José Expósito - */ - -#ifndef RUNCOMMAND_H -#define RUNCOMMAND_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Ejecuta el comando indicado en la configuración. - * - * @~english - * Runs the command specified in the configuration. - */ -class RunCommand : public Action { - - private: - - /** - * @~spanish - * Comando a ejecutar. - * - * @~english - * Command to execute. - */ - QString command; - - public: - - RunCommand(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // RUNCOMMAND_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/SendKeys.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/SendKeys.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/SendKeys.cpp.svn-base 2011-04-12 16:34:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/SendKeys.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/SendKeys.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class SendKeys - * @author José Expósito - */ -#include "SendKeys.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -SendKeys::SendKeys(const QString& settings, Window window) - : Action(settings, window) { - qDebug() << settings; - - if(settings.split(":").length() != 2) { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } - - QString allHoldDown = settings.split(":").at(0); - QString allBetween = settings.split(":").at(1); - - if(allHoldDown.split("=").length() != 2 - || allBetween.split("=").length() != 2) { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } - - if(allHoldDown.split("=").at(0) != "HOLD_DOWN" - || allBetween.split("=").at(0) != "PRESS") { - qWarning() << "Error reading SEND_KEYS settings"; - return; - } - - QString holdDownStr = allHoldDown.split("=").at(1); - QString betweenStr = allBetween.split("=").at(1); - QStringList holdDownList = holdDownStr.split("|"); - QStringList betweenList = betweenStr.split("|"); - - for(int n=0; nholdDownKeys.append(keyCode); - } - } - - for(int n=0; npressBetweenKeys.append(keyCode); - } - } -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void SendKeys::executeStart(const QHash& /*attrs*/) {} - -void SendKeys::executeUpdate(const QHash& /*attrs*/) {} - -void SendKeys::executeFinish(const QHash& /*attrs*/) { - - for(int n=0; nholdDownKeys.length(); n++) { - XTestFakeKeyEvent(QX11Info::display(),this->holdDownKeys.at(n),true,0); - } - - for(int n=0; npressBetweenKeys.length(); n++) { - XTestFakeKeyEvent(QX11Info::display(), this->pressBetweenKeys.at(n), - true, 0); - XTestFakeKeyEvent(QX11Info::display(), this->pressBetweenKeys.at(n), - false, 0); - } - - for(int n=0; nholdDownKeys.length(); n++) { - XTestFakeKeyEvent(QX11Info::display(),this->holdDownKeys.at(n),false,0); - } -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/SendKeys.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/SendKeys.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/SendKeys.h.svn-base 2011-03-30 22:12:08.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/SendKeys.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/SendKeys.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class SendKeys - * @author José Expósito - */ -#ifndef SENDKEYS_H -#define SENDKEYS_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Envía las teclas indicadas en la configuración a la ventana activa. - * - * @~english - * Envía las teclas indicadas en la configuración a la ventana activa. - */ -class SendKeys : public Action { - - private: - - /** - * @~spanish - * Teclas a mantener pulsadas mientras se envían el resto de teclas. - * - * @~english - * Keys to hold down while sending the rest of keys. - */ - QList holdDownKeys; - - /** - * @~spanish - * Teclas a enviar mientras se mantienen pulsadas las holdDownKeys. - * - * @~english - * Keys to send while holdDownKeys are sending. - */ - QList pressBetweenKeys; - - public: - - SendKeys(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // SENDKEYS_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.cpp.svn-base 2011-03-30 22:12:17.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ShowDesktop.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ShowDesktop - * @author José Expósito - */ -#include "ShowDesktop.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -ShowDesktop::ShowDesktop(const QString& settings, Window window) - : Action(settings, window) {} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void ShowDesktop::executeStart(const QHash& /*attrs*/) {} - -void ShowDesktop::executeUpdate(const QHash& /*attrs*/) {} - -void ShowDesktop::executeFinish(const QHash& /*attrs*/) { - // Vemos si ya se está en modo show desktop - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - - XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), - XInternAtom(QX11Info::display(), "_NET_SHOWING_DESKTOP", false), - 0, 1, false, XA_CARDINAL, &atomRet, &size, &numItems, - &bytesAfterReturn, &propRet); - bool isShowingDesktop = *((bool *) propRet); - XFree(propRet); - - // Minimizamos o restauramos todas la ventanas - XClientMessageEvent event; - event.window = QX11Info::appRootWindow(QX11Info::appScreen()); - event.type = ClientMessage; - event.message_type = XInternAtom(QX11Info::display(), - "_NET_SHOWING_DESKTOP", false); - event.format = 32; - event.data.l[0] = !isShowingDesktop; - - XSendEvent(QX11Info::display(), - QX11Info::appRootWindow(QX11Info::appScreen()), false, - (SubstructureNotifyMask | SubstructureRedirectMask), - (XEvent*)&event); - XFlush(QX11Info::display()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.h.svn-base 2011-03-30 22:12:12.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/ShowDesktop.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/ShowDesktop.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ShowDesktop - * @author José Expósito - */ -#ifndef SHOWDESKTOP_H -#define SHOWDESKTOP_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Muestra el escritorio. - * - * @~english - * Shows the desktop. - */ -class ShowDesktop : public Action { - - public: - - ShowDesktop(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // SHOWDESKTOP_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.cpp.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.cpp.svn-base 2011-03-30 22:12:15.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/VerticalScroll.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class VerticalScroll - * @author José Expósito - */ -#include "VerticalScroll.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -VerticalScroll::VerticalScroll(const QString& settings, Window window) - : Action(settings, window) { - this->upScrollSpace = 0; - this->downScrollSpace = 0; - this->speed = 30; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "SPEED") { - bool ok; - int configSpeed = QString(strl.at(1)).toInt(&ok); - if(ok && configSpeed >= 1 && configSpeed <= 10) - this->speed = 40 - 2*configSpeed; - else - qWarning() << "Error reading VERTICAL_SCROLL settings, using " << - "the default settings"; - } else - qWarning() << "Error reading VERTICAL_SCROLL settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void VerticalScroll::executeStart(const QHash& /*attrs*/) {} - -void VerticalScroll::executeUpdate(const QHash& attrs) { - float deltaY = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat(); - - if(deltaY > 0) { - this->downScrollSpace += (int)deltaY; - - while(this->downScrollSpace >= this->speed) { - this->downScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), Button5, true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button5, false, 0); - XFlush(QX11Info::display()); - } - - } else { - this->upScrollSpace -= (int)deltaY; - - while(this->upScrollSpace >= this->speed) { - this->upScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), Button4, true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button4, false, 0); - XFlush(QX11Info::display()); - } - } -} - -void VerticalScroll::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.h.svn-base touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.h.svn-base 2011-03-30 22:12:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/.svn/text-base/VerticalScroll.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/VerticalScroll.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class VerticalScroll - * @author José Expósito - */ -#ifndef VERTICALSCROLL_H -#define VERTICALSCROLL_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula la rueda del ratón. - * - * @~english - * Emulates the mouse whell. - */ -class VerticalScroll : public Action { - - private: - - /** - * @~spanish - * Velocidad del scroll. A mayor más lento. - * - * @~english - * Scroll speed. More is slower. - */ - int speed; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia arriba. - * - * @~english - * Accumulated space to scrolling up. - */ - int upScrollSpace; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia abajo. - * - * @~english - * Accumulated space to scrolling down. - */ - int downScrollSpace; - - public: - - VerticalScroll(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // VERTICALSCROLL_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/VerticalScroll.cpp touchegg-1.0/src/touchegg/actions/implementation/VerticalScroll.cpp --- touchegg-0.3+repack/src/touchegg/actions/implementation/VerticalScroll.cpp 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/VerticalScroll.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/VerticalScroll.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class VerticalScroll - * @author José Expósito - */ -#include "VerticalScroll.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -VerticalScroll::VerticalScroll(const QString& settings, Window window) - : Action(settings, window) { - this->upScrollSpace = 0; - this->downScrollSpace = 0; - this->speed = 30; - - QStringList strl = settings.split("="); - if(strl.length() == 2 && strl.at(0) == "SPEED") { - bool ok; - int configSpeed = QString(strl.at(1)).toInt(&ok); - if(ok && configSpeed >= 1 && configSpeed <= 10) - this->speed = 40 - 2*configSpeed; - else - qWarning() << "Error reading VERTICAL_SCROLL settings, using " << - "the default settings"; - } else - qWarning() << "Error reading VERTICAL_SCROLL settings, using " << - "the default settings"; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void VerticalScroll::executeStart(const QHash& /*attrs*/) {} - -void VerticalScroll::executeUpdate(const QHash& attrs) { - float deltaY = attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat(); - - if(deltaY > 0) { - this->downScrollSpace += (int)deltaY; - - while(this->downScrollSpace >= this->speed) { - this->downScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), Button5, true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button5, false, 0); - XFlush(QX11Info::display()); - } - - } else { - this->upScrollSpace -= (int)deltaY; - - while(this->upScrollSpace >= this->speed) { - this->upScrollSpace -= this->speed; - - XTestFakeButtonEvent(QX11Info::display(), Button4, true, 0); - XTestFakeButtonEvent(QX11Info::display(), Button4, false, 0); - XFlush(QX11Info::display()); - } - } -} - -void VerticalScroll::executeFinish(const QHash& /*attrs*/) {} diff -Nru touchegg-0.3+repack/src/touchegg/actions/implementation/VerticalScroll.h touchegg-1.0/src/touchegg/actions/implementation/VerticalScroll.h --- touchegg-0.3+repack/src/touchegg/actions/implementation/VerticalScroll.h 2011-03-30 21:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/implementation/VerticalScroll.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/** - * @file /src/touchegg/actions/implementation/VerticalScroll.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class VerticalScroll - * @author José Expósito - */ -#ifndef VERTICALSCROLL_H -#define VERTICALSCROLL_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/actions/implementation/Action.h" - -/** - * @~spanish - * Emula la rueda del ratón. - * - * @~english - * Emulates the mouse whell. - */ -class VerticalScroll : public Action { - - private: - - /** - * @~spanish - * Velocidad del scroll. A mayor más lento. - * - * @~english - * Scroll speed. More is slower. - */ - int speed; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia arriba. - * - * @~english - * Accumulated space to scrolling up. - */ - int upScrollSpace; - - /** - * @~spanish - * Desplazamiento acumulado al hacer scroll hacia abajo. - * - * @~english - * Accumulated space to scrolling down. - */ - int downScrollSpace; - - public: - - VerticalScroll(const QString& settings, Window window); - - void executeStart(const QHash& attrs); - - void executeUpdate(const QHash& attrs); - - void executeFinish(const QHash& attrs); -}; - -#endif // VERTICALSCROLL_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/.svn/all-wcprops touchegg-1.0/src/touchegg/actions/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/actions/.svn/all-wcprops 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 46 -/svn/!svn/ver/97/touchegg/src/touchegg/actions -END diff -Nru touchegg-0.3+repack/src/touchegg/actions/.svn/entries touchegg-1.0/src/touchegg/actions/.svn/entries --- touchegg-0.3+repack/src/touchegg/actions/.svn/entries 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/actions -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -types -dir - -implementation -dir - -factory -dir - diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/ActionTypeEnum.cpp touchegg-1.0/src/touchegg/actions/types/ActionTypeEnum.cpp --- touchegg-0.3+repack/src/touchegg/actions/types/ActionTypeEnum.cpp 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/ActionTypeEnum.cpp 2011-07-11 06:35:44.000000000 +0000 @@ -1,32 +1,39 @@ /** * @file src/touchegg/actions/types/ActionTypeEnum.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ActionTypeEnum - * @author José Expósito */ #include "ActionTypeEnum.h" - // ************************************************************************** // // ********** STATIC METHODS AND VARIABLES ********** // // ************************************************************************** // -QString ActionTypeEnum::getValue(ActionType atEnum) { +QString ActionTypeEnum::getValue(ActionType atEnum) +{ ActionTypeEnum actionTypeEnum; int index = actionTypeEnum.metaObject()->indexOfEnumerator("ActionType"); QMetaEnum metaEnum = actionTypeEnum.metaObject()->enumerator(index); return metaEnum.valueToKey(atEnum); } -ActionTypeEnum::ActionType ActionTypeEnum::getEnum(const QString& atString) { +ActionTypeEnum::ActionType ActionTypeEnum::getEnum(const QString& atString) +{ ActionTypeEnum actionTypeEnum; int index = actionTypeEnum.metaObject()->indexOfEnumerator("ActionType"); QMetaEnum metaEnum = actionTypeEnum.metaObject()->enumerator(index); diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/ActionTypeEnum.h touchegg-1.0/src/touchegg/actions/types/ActionTypeEnum.h --- touchegg-0.3+repack/src/touchegg/actions/types/ActionTypeEnum.h 2011-04-13 08:57:07.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/ActionTypeEnum.h 2011-07-11 07:06:49.000000000 +0000 @@ -1,23 +1,28 @@ /** * @file src/touchegg/actions/types/ActionTypeEnum.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class ActionTypeEnum - * @author José Expósito */ #ifndef ACTIONTYPEENUM_H #define ACTIONTYPEENUM_H #include "src/touchegg/util/Include.h" - /** * @~spanish * Contiene un tipo enumerado con las acciones soportadas. @@ -25,59 +30,59 @@ * @~english * Contains a enumeradted type with supported actions. */ -class ActionTypeEnum : public QObject { +class ActionTypeEnum : public QObject +{ Q_OBJECT Q_ENUMS(ActionType); - public: +public: - /** - * @~spanish - * Tipo enumerado con las acciones soportadas. - * - * @~english - * Enumerated type with supported actions. - */ - enum ActionType { - NO_ACTION, - MOUSE_CLICK, - VERTICAL_SCROLL, - HORIZONTAL_SCROLL, - MINIMIZE_WINDOW, - MAXIMIZE_RESTORE_WINDOW, - CLOSE_WINDOW, - RESIZE_WINDOW, - SHOW_DESKTOP, - CHANGE_DESKTOP, - CHANGE_VIEWPORT, - SEND_KEYS, - MOVE_WINDOW, - RUN_COMMAND, - DRAG_AND_DROP - }; - - /** - * @~spanish - * Convierte el tipo enumedrado a QString. - * @return El QString - * - * @~english - * Converts the enum to QString. - * @return The QString. - */ - static QString getValue(ActionType atEnum); - - /** - * @~spanish - * Convierte el QString indicado en su equivalente tipo enumedrado. - * @return El tipo enumerado - * - * @~english - * Converts the indicated QString to the equivalent enum type. - * @return The enum type. - */ - static ActionType getEnum(const QString& atString); + /** + * @~spanish + * Tipo enumerado con las acciones soportadas. + * + * @~english + * Enumerated type with supported actions. + */ + enum ActionType { + NO_ACTION, + MOUSE_CLICK, + SCROLL, + MINIMIZE_WINDOW, + MAXIMIZE_RESTORE_WINDOW, + CLOSE_WINDOW, + RESIZE_WINDOW, + SHOW_DESKTOP, + CHANGE_DESKTOP, + CHANGE_VIEWPORT, + SEND_KEYS, + MOVE_WINDOW, + RUN_COMMAND, + DRAG_AND_DROP + }; + + /** + * @~spanish + * Convierte el tipo enumedrado a QString. + * @return El QString + * + * @~english + * Converts the enum to QString. + * @return The QString. + */ + static QString getValue(ActionType atEnum); + + /** + * @~spanish + * Convierte el QString indicado en su equivalente tipo enumedrado. + * @return El tipo enumerado + * + * @~english + * Converts the indicated QString to the equivalent enum type. + * @return The enum type. + */ + static ActionType getEnum(const QString& atString); }; #endif // ACTIONTYPEENUM_H diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/.svn/all-wcprops touchegg-1.0/src/touchegg/actions/types/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/actions/types/.svn/all-wcprops 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/types -END -ActionTypeEnum.cpp -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/types/ActionTypeEnum.cpp -END -ActionTypeEnum.h -K 25 -svn:wc:ra_dav:version-url -V 70 -/svn/!svn/ver/108/touchegg/src/touchegg/actions/types/ActionTypeEnum.h -END -actions.types.pri -K 25 -svn:wc:ra_dav:version-url -V 70 -/svn/!svn/ver/97/touchegg/src/touchegg/actions/types/actions.types.pri -END diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/.svn/entries touchegg-1.0/src/touchegg/actions/types/.svn/entries --- touchegg-0.3+repack/src/touchegg/actions/types/.svn/entries 2011-04-13 10:11:28.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/actions/types -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -ActionTypeEnum.cpp -file - - - - -2011-03-23T00:27:29.936916Z -1858b6588c98ae2e2257d633986c89aa -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1345 - -ActionTypeEnum.h -file -108 - - - -2011-04-13T08:57:07.321249Z -2a4f767137a5940d790fe67bc77f5c61 -2011-04-13T10:11:19.413562Z -108 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2051 - -actions.types.pri -file - - - - -2011-03-23T00:27:29.936916Z -d70f4f69d79d6c9c7c5f4d0fe39dbf20 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -128 - diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/actions.types.pri.svn-base touchegg-1.0/src/touchegg/actions/types/.svn/text-base/actions.types.pri.svn-base --- touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/actions.types.pri.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/.svn/text-base/actions.types.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/actions/types/ActionTypeEnum.h - -SOURCES += \ - src/touchegg/actions/types/ActionTypeEnum.cpp diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.cpp.svn-base touchegg-1.0/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.cpp.svn-base 2011-03-23 00:27:29.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/** - * @file src/touchegg/actions/types/ActionTypeEnum.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ActionTypeEnum - * @author José Expósito - */ -#include "ActionTypeEnum.h" - - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -QString ActionTypeEnum::getValue(ActionType atEnum) { - ActionTypeEnum actionTypeEnum; - int index = actionTypeEnum.metaObject()->indexOfEnumerator("ActionType"); - QMetaEnum metaEnum = actionTypeEnum.metaObject()->enumerator(index); - return metaEnum.valueToKey(atEnum); -} - -ActionTypeEnum::ActionType ActionTypeEnum::getEnum(const QString& atString) { - ActionTypeEnum actionTypeEnum; - int index = actionTypeEnum.metaObject()->indexOfEnumerator("ActionType"); - QMetaEnum metaEnum = actionTypeEnum.metaObject()->enumerator(index); - return (ActionTypeEnum::ActionType)metaEnum.keyToValue( - atString.toStdString().c_str()); -} diff -Nru touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.h.svn-base touchegg-1.0/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.h.svn-base --- touchegg-0.3+repack/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.h.svn-base 2011-04-13 10:11:26.000000000 +0000 +++ touchegg-1.0/src/touchegg/actions/types/.svn/text-base/ActionTypeEnum.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/** - * @file src/touchegg/actions/types/ActionTypeEnum.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class ActionTypeEnum - * @author José Expósito - */ -#ifndef ACTIONTYPEENUM_H -#define ACTIONTYPEENUM_H - -#include "src/touchegg/util/Include.h" - - -/** - * @~spanish - * Contiene un tipo enumerado con las acciones soportadas. - * - * @~english - * Contains a enumeradted type with supported actions. - */ -class ActionTypeEnum : public QObject { - - Q_OBJECT - Q_ENUMS(ActionType); - - public: - - /** - * @~spanish - * Tipo enumerado con las acciones soportadas. - * - * @~english - * Enumerated type with supported actions. - */ - enum ActionType { - NO_ACTION, - MOUSE_CLICK, - VERTICAL_SCROLL, - HORIZONTAL_SCROLL, - MINIMIZE_WINDOW, - MAXIMIZE_RESTORE_WINDOW, - CLOSE_WINDOW, - RESIZE_WINDOW, - SHOW_DESKTOP, - CHANGE_DESKTOP, - CHANGE_VIEWPORT, - SEND_KEYS, - MOVE_WINDOW, - RUN_COMMAND, - DRAG_AND_DROP - }; - - /** - * @~spanish - * Convierte el tipo enumedrado a QString. - * @return El QString - * - * @~english - * Converts the enum to QString. - * @return The QString. - */ - static QString getValue(ActionType atEnum); - - /** - * @~spanish - * Convierte el QString indicado en su equivalente tipo enumedrado. - * @return El tipo enumerado - * - * @~english - * Converts the indicated QString to the equivalent enum type. - * @return The enum type. - */ - static ActionType getEnum(const QString& atString); -}; - -#endif // ACTIONTYPEENUM_H diff -Nru touchegg-0.3+repack/src/touchegg/config/Config.cpp touchegg-1.0/src/touchegg/config/Config.cpp --- touchegg-0.3+repack/src/touchegg/config/Config.cpp 2011-04-17 18:15:47.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/Config.cpp 2011-09-02 06:42:32.000000000 +0000 @@ -1,39 +1,53 @@ /** * @file /src/touchegg/config/Config.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class Config - * @author José Expósito */ #include "Config.h" // ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // +// ********** ANONYMOUS NAMESPACE ********** // // ************************************************************************** // -const char* Config::USR_SHARE_CONFIG_FILE = "/usr/share/touchegg/touchegg.conf"; -const char* Config::HOME_CONFIG_FILE = "/.touchegg/touchegg.conf"; -const char* Config::HOME_CONFIG_DIR = ".touchegg"; +namespace +{ + const char* USR_SHARE_CONFIG_FILE = "/usr/share/touchegg/touchegg.conf"; + const char* HOME_CONFIG_FILE = "/.config/touchegg/touchegg.conf"; + const char* HOME_CONFIG_DIR = ".config/touchegg"; +} -//------------------------------------------------------------------------------ + +// ************************************************************************** // +// ********** STATIC METHODS AND VARIABLES ********** // +// ************************************************************************** // Config* Config::instance = NULL; -Config* Config::getInstance() { +Config* Config::getInstance() +{ if(Config::instance == NULL) Config::instance = new Config(); return Config::instance; } -void Config::loadConfig() { +void Config::loadConfig() +{ if(instance != NULL) { delete instance; instance = NULL; @@ -46,16 +60,19 @@ // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // -Config::Config() { - // Comprobamos que los archivos estén en su sitio +Config::Config() +{ + this->composedGesturesTime = 0; QFile homeFile(QDir::homePath() + HOME_CONFIG_FILE); QFile usrFile(USR_SHARE_CONFIG_FILE); + // If the /usr/share/touchegg configuration file is not found then exit if(!usrFile.exists()) { qFatal("%s not found, reinstall application can solve the problem\n", USR_SHARE_CONFIG_FILE); } + // If the ~/.config/touchegg configuration file doesn't exist copy it if(!homeFile.exists()) { qDebug() << QDir::homePath() + HOME_CONFIG_FILE << " not found, copying config from " @@ -64,6 +81,7 @@ usrFile.copy(QDir::homePath() + HOME_CONFIG_FILE); } + // Load the configuration into the QHash qDebug() << "Reading config from " << QDir::homePath() + HOME_CONFIG_FILE; this->initConfig(homeFile); } @@ -72,33 +90,164 @@ // ********** PRIVATE METHODS ********** // // ************************************************************************** // -void Config::initConfig(QFile& file) { - file.open(QIODevice::ReadOnly); +void Config::initConfig(QFile& file) +{ + // Loads the XML file + QDomDocument document; + if (!file.open(QIODevice::ReadOnly)) + qFatal("Can't open configuration file for read"); + if (!document.setContent(&file)) { + file.close(); + qFatal("Error reading configuration, please, review the format"); + } + file.close(); + + /* + * A very simple example of a configuration file: + * + * + * + * 140 + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * HOLD_DOWN=Control_L:PRESS=KP_Add + * + * + * + * + * + * HOLD_DOWN=Control_L:PRESS=KP_Subtract + * + * + * + * + * + * + */ + + for(QDomNode appNode=document.documentElement().firstChild(); + !appNode.isNull(); appNode=appNode.nextSibling()) { + QDomElement appElem = appNode.toElement(); + if(appElem.isNull()) + continue; + + // Load general Touchégg settings + if(appElem.tagName() == "settings") { + + for(QDomNode propNode=appNode.firstChild(); + !propNode.isNull(); propNode=propNode.nextSibling()) { + if(!propNode.toElement().isNull() + && propNode.toElement().attribute("name") + == "composed_gestures_time") { + this->composedGesturesTime = + propNode.toElement().text().toInt(); + } + } + + // Load applications/gestures settings + } else { - while(!file.atEnd()) { - QString line(file.readLine()); - line = line.trimmed(); - int index = line.indexOf("="); - - if(line != "" && index != -1) { - // Guardamos el valor en el QHash - QString key = line.left(index); - QString value = line.mid(index+1); - this->settings.insert(key, value); - - // Si es un gesto y está en uso, lo añadimos a la usedGestures - QStringList aux = key.split("."); - if(aux.size() == 3 && aux.at(2) == "action" - && value != "" && value != "NO_ACTION") { - QStringList geisEquiv = GestureTypeEnum::getGeisEquivalent( - GestureTypeEnum::getEnum(aux.at(0))); - this->usedGestures.append(geisEquiv); + for(QDomNode gestureNode=appNode.firstChild();!gestureNode.isNull(); + gestureNode=gestureNode.nextSibling()) { + QDomElement gestureElem = gestureNode.toElement(); + if(gestureElem.isNull()) + continue; + + // For common configuration applications + QStringList apps = appElem.attribute("name").split(","); + QStringList keys; + + for(int n=0; nsettings.insert(keys.at(n) + ".action", action); + this->settings.insert(keys.at(n) + ".settings", settings); + } + + //-------------------------------------------------------------- + + // If is an used gesture add it to the usedGestures QHash + if(action != "" && action != "NO_ACTION") { + for(int n=0; nsaveUsedGestures(app, gesture, fingers); + } + } } + } } +} - this->usedGestures.removeDuplicates(); - file.close(); +void Config::saveUsedGestures(const QString &app, const QString &gestureType, + int numFingers) +{ + + if(this->usedGestures.contains(app)) { + QList< QPair > aux = this->usedGestures.value(app); + QStringList gestures = GestureTypeEnum::getGeisEquivalent( + GestureTypeEnum::getEnum(gestureType)); + + QPair pair; + pair.first = gestures; + pair.second = numFingers; + + aux.append(pair); + this->usedGestures.insert(app, aux); + + } else { + QList< QPair > aux; + QStringList gestures = GestureTypeEnum::getGeisEquivalent( + GestureTypeEnum::getEnum(gestureType)); + + QPair pair; + pair.first = gestures; + pair.second = numFingers; + + aux.append(pair); + this->usedGestures.insert(app, aux); + } } @@ -106,43 +255,81 @@ // ********** GET/SET/IS ********** // // ************************************************************************** // -QStringList Config::getUsedGestures() const { - return this->usedGestures; +QList< QPair > Config::getUsedGestures( + const QString& application) const +{ + QList< QPair > r = this->usedGestures.value(application); + return r; } //------------------------------------------------------------------------------ -int Config::getTapAndHoldTime() const { - bool ok; - int ret = this->settings.value( - "general_settings.tap_and_hold_time").toInt(&ok); - return ok ? ret : 135; +int Config::getComposedGesturesTime() const +{ + return this->composedGesturesTime; } //------------------------------------------------------------------------------ -ActionTypeEnum::ActionType Config::getAssociatedAction( - GestureTypeEnum::GestureType gestureType, QString appClass) const { - QString gesture = GestureTypeEnum::getValue(gestureType); - QString keyWithClass = gesture + "." + appClass + ".action"; - - if(this->settings.contains(keyWithClass)) { - return ActionTypeEnum::getEnum(this->settings.value(keyWithClass)); - } else { - QString key = gesture + ".ALL.action"; - return ActionTypeEnum::getEnum(this->settings.value(key)); - } +ActionTypeEnum::ActionType Config::getAssociatedAction(const QString& appClass, + GestureTypeEnum::GestureType gestureType, int numFingers, + GestureDirectionEnum::GestureDirection dir) const +{ + QString exactKey = appClass + "." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + "." + + GestureDirectionEnum::getValue(dir) + ".action"; + QString allDirectionsKey = appClass + "." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + ".ALL.action"; + QString globalExactKey = "All." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + "." + + GestureDirectionEnum::getValue(dir) + ".action"; + QString globalAllDirectionsKey = "All." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + ".ALL.action"; + + if(this->settings.contains(exactKey)) + return ActionTypeEnum::getEnum(this->settings.value(exactKey)); + else if(this->settings.contains(allDirectionsKey)) + return ActionTypeEnum::getEnum(this->settings.value(allDirectionsKey)); + else if(this->settings.contains(globalExactKey)) + return ActionTypeEnum::getEnum(this->settings.value(globalExactKey)); + else if(this->settings.contains(globalAllDirectionsKey)) + return ActionTypeEnum::getEnum(this->settings.value( + globalAllDirectionsKey)); + else + return ActionTypeEnum::NO_ACTION; } -QString Config::getAssociatedSettings(GestureTypeEnum::GestureType - gestureType, QString appClass) const { - QString gesture = GestureTypeEnum::getValue(gestureType); - QString keyWithClass = gesture + "." + appClass + ".settings"; - - if(this->settings.contains(keyWithClass)) { - return this->settings.value(keyWithClass); - } else { - QString key = gesture + ".ALL.settings"; - return this->settings.value(key); - } +QString Config::getAssociatedSettings(const QString& appClass, + GestureTypeEnum::GestureType gestureType, int numFingers, + GestureDirectionEnum::GestureDirection dir) const +{ + QString exactKey = appClass + "." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + "." + + GestureDirectionEnum::getValue(dir) + ".settings"; + QString allDirectionsKey = appClass + "." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + ".ALL.settings"; + QString globalExactKey = "All." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + "." + + GestureDirectionEnum::getValue(dir) + ".settings"; + QString globalAllDirectionsKey = "All." + + GestureTypeEnum::getValue(gestureType) + "." + + QString::number(numFingers) + ".ALL.settings"; + + if(this->settings.contains(exactKey)) + return this->settings.value(exactKey); + else if(this->settings.contains(allDirectionsKey)) + return this->settings.value(allDirectionsKey); + else if(this->settings.contains(globalExactKey)) + return this->settings.value(globalExactKey); + else if(this->settings.contains(globalAllDirectionsKey)) + return this->settings.value(globalAllDirectionsKey); + else + return ""; } diff -Nru touchegg-0.3+repack/src/touchegg/config/Config.h touchegg-1.0/src/touchegg/config/Config.h --- touchegg-0.3+repack/src/touchegg/config/Config.h 2011-04-17 17:25:34.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/Config.h 2011-09-02 06:39:08.000000000 +0000 @@ -1,22 +1,29 @@ /** * @file /src/touchegg/config/Config.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class Config - * @author José Expósito */ #ifndef CONFIG_H #define CONFIG_H #include "src/touchegg/util/Include.h" #include "src/touchegg/gestures/types/GestureTypeEnum.h" +#include "src/touchegg/gestures/types/GestureDirectionEnum.h" #include "src/touchegg/actions/types/ActionTypeEnum.h" /** @@ -26,161 +33,200 @@ * @~english * Singleton that provides access to the configuration. */ -class Config { +class Config +{ - private: +private: - // Constants to access to the settings - static const char* USR_SHARE_CONFIG_FILE; - static const char* HOME_CONFIG_FILE; // Sumarle el $HOME por delante - static const char* HOME_CONFIG_DIR; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * QHash con la configuración. - * @see initConfig() - * - * @~english - * QHash with the configuration. - * @see initConfig() - */ - QHash settings; - - /** - * @~spanish - * Lista con los gestos utilizados por Touchégg, es decir, todos los que - * tengan alguna acción asociada. - * Se encuentran directamente en el formato utilizado por GEIS para - * suscribirse a los mismo. - * - * @~english - * List with the gestures used by Touchégg, this is, all gestures with - * an asocied action to it. - * They are saved directly in the format used for GEIS to subscribe to - * this gestures. - */ - QStringList usedGestures; - - /** - * @~spanish - * Inicializa el QHash que contiene la configuración. Dicho QHash tendrá - * como clave una cadena del tipo "TWO_FINGERS_TAP.ALL.action" y como - * valor, en este caso, la acción correspondiente. - * @param file Archivo desde el que leer la configuración. - * - * @~english - * Initializes the QHas that contains the settings. This QHash will have - * as key a string like "TWO_FINGERS_TAP.ALL.action" and as value, in - * this case, the action. - * @param file File from which to read configuration. - */ - void initConfig(QFile& file); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static Config* instance; - - // Hide constructors - Config(); - Config(const Config&); - const Config& operator = (const Config&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static Config* getInstance(); - - /** - * @~spanish - * (Re)Carga la configuración. - * - * @~english - * (Re)Load configuration. - */ - static void loadConfig(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve una lista de todos los gestos con una acción asociada. - * Se encuentran directamente en el formato utilizado por GEIS para - * suscribirse a los mismo. - * @return Dicha lista. - * - * @~english - * Returns a list with all gestures with an associate action. - * They are saved directly in the format used for GEIS to subscribe to - * this gestures. - * @return The list. - */ - QStringList getUsedGestures() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tiempo, en milisegundos, en el que se puede ejecutar un - * tap&hold. - * @return El tiempo. - * - * @~english - * Returns the time, in milliseconds, which can run a tap & hold. - * @return The time. - */ - int getTapAndHoldTime() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tipo de acción asociada a el gesto indicado. - * @param gestureType El gesto que se realiza. - * @param appClass Aplicación sobre la que se realiza el gesto. - * @return Tipo de la acción asociada. - * - * @~english - * Returns the associated action type with a gesture. - * @param gestureType The gesture that is made. - * @param appClass Application where it is made ​​the gesture. - * @return Type of associated action. - */ - ActionTypeEnum::ActionType getAssociatedAction( - GestureTypeEnum::GestureType gestureType, QString appClass) - const; - - /** - * @~spanish - * Devuelve la configuración de la acción asocada a un gesto indicado. - * @param gestureType Gesto indicado. - * @param appClass Aplicación sobre la que se realiza el gesto. - * @return La configuración. - * - * @~english - * Returns the associated config with the indicated gesture. - * @param gestureType The gesture. - * @param appClass Application where it is made ​​the gesture. - * @return The settings. - */ - QString getAssociatedSettings(GestureTypeEnum::GestureType - gestureType, QString appClass) const; + /** + * @~spanish + * Tiempo a esperar entre los gestos compuestos. + * + * @~english + * Time to wait between composed gestures. + */ + int composedGesturesTime; + + /** + * @~spanish + * QHash con la configuración. Las claves son del tipo + * Aplicación.TipoGesto.NúmeroDedos.Dirección.action/settings y el valor + * será la acción o la configuración asociada al gesto. + * + * @~english + * QHash with the configuration. The keys are like + * Application.GestureType.NumFingers.Direction.action/settings and the + * value is the action or the settings associate to the gesture. + */ + QHash settings; + + /** + * @~spanish + * QHash con los gestos utilizados por Touchégg, siendo la clave la + * aplicación y el valor los gestos. + * Los gestos se encuentran directamente en el formato utilizado por + * GEIS para suscribirse a los mismo. + * + * @~english + * QHash with the gestures used by Touchégg, being the key the + * application and the value the gestures. + * The gestures are saved directly in the format used for GEIS to + * subscribe to this gestures. + */ + QHash > > usedGestures; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Inicializa los QHash's de configuración y gestos usados. + * @param file Archivo desde el que leer la configuración. + * @see settings + * @see usedGestures + * + * @~english + * Initializes the QHash's for the configuration and used gestures. + * @param file File from which to read configuration. + * @see settings + * @see usedGestures + */ + void initConfig(QFile& file); + + /** + * @~spanish + * Guarda los gestos usados en la lista. + * @param app Aplicación. + * @param gestureType Tipo del gesto. + * @param numFingers Número de dedos. + * + * @~english + * Saves the used gestures in the list. + * @param app The application. + * @param gestureType The gesture to save. + * @param numFingers Number of fingers. + */ + void saveUsedGestures(const QString &app, const QString &gestureType, + int numFingers); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Única instancia de la clase. + * + * @~english + * Single instance of the class. + */ + static Config* instance; + + // Hide constructors + Config(); + Config(const Config&); + const Config& operator = (const Config&); + +public: + + /** + * @~spanish + * Único método para obtener una instancia de la clase. + * @return La única instancia de la clase. + * + * @~english + * Only method to get an instance of the class. + * @return The single instance of the class. + */ + static Config* getInstance(); + + /** + * @~spanish + * (Re)Carga la configuración. + * + * @~english + * (Re)Load configuration. + */ + static void loadConfig(); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve una lista con todos los gestos utilizados por la aplicación + * indicada. Si no tiene gestos asociados devuelve una lista vacia. + * Se encuentran directamente en el formato utilizado por GEIS para + * suscribirse a los mismo. + * @param application La aplicación. + * @return Dicha lista, compuesta por el nombre en formato GEIS y el número + * de dedos. + * + * @~english + * Returns a list with all gestures used by the specified application. + * If the app haven't got associated gestures returns an empty list. + * They are saved directly in the format used for GEIS to subscribe to + * this gestures. + * @param The application. + * @return The list, composed by the name, in GEIS format, and the number of + * fingers. + */ + QList< QPair > getUsedGestures( + const QString& application) const; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve el tiempo, en milisegundos, en el que se puede ejecutar un + * gesto compuesto. + * @return El tiempo. + * + * @~english + * Returns the time, in milliseconds, which can run a composed gesture. + * @return The time. + */ + int getComposedGesturesTime() const; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve el tipo de acción asociada a el gesto indicado. + * @param appClass Aplicación sobre la que se realiza el gesto. + * @param gestureType El gesto que se realiza. + * @param numFingers Número de dedos usados por el gesto. + * @param dir Dirección del gesto. + * @return Tipo de la acción asociada. + * + * @~english + * Returns the associated action type with a gesture. + * @param appClass Application where it is made ​​the gesture. + * @param gestureType The gesture that is made. + * @param numFingers Number of fingers used by the gesture. + * @param dir Direction of the gesture. + * @return Type of associated action. + */ + ActionTypeEnum::ActionType getAssociatedAction(const QString& appClass, + GestureTypeEnum::GestureType gestureType, int numFingers, + GestureDirectionEnum::GestureDirection dir) const; + + /** + * @~spanish + * Devuelve la configuración de la acción asocada a un gesto indicado. + * @param appClass Aplicación sobre la que se realiza el gesto. + * @param gestureType El gesto que se realiza. + * @param numFingers Número de dedos usados por el gesto. + * @param dir Dirección del gesto. + * @return La configuración. + * + * @~english + * Returns the associated config with the indicated gesture. + * @param appClass Application where it is made ​​the gesture. + * @param gestureType The gesture that is made. + * @param numFingers Number of fingers used by the gesture. + * @param dir Direction of the gesture. + * @return The settings. + */ + QString getAssociatedSettings(const QString& appClass, + GestureTypeEnum::GestureType gestureType, int numFingers, + GestureDirectionEnum::GestureDirection dir) const; }; diff -Nru touchegg-0.3+repack/src/touchegg/config/.svn/all-wcprops touchegg-1.0/src/touchegg/config/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/config/.svn/all-wcprops 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 45 -/svn/!svn/ver/97/touchegg/src/touchegg/config -END -Config.cpp -K 25 -svn:wc:ra_dav:version-url -V 57 -/svn/!svn/ver/109/touchegg/src/touchegg/config/Config.cpp -END -Config.h -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/109/touchegg/src/touchegg/config/Config.h -END -config.pri -K 25 -svn:wc:ra_dav:version-url -V 56 -/svn/!svn/ver/97/touchegg/src/touchegg/config/config.pri -END diff -Nru touchegg-0.3+repack/src/touchegg/config/.svn/entries touchegg-1.0/src/touchegg/config/.svn/entries --- touchegg-0.3+repack/src/touchegg/config/.svn/entries 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/config -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -Config.cpp -file -109 - - - -2011-04-17T18:15:47.786740Z -da4c995b889dd2935f657cf8cf2d643f -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -5099 - -Config.h -file -109 - - - -2011-04-17T17:25:34.662741Z -a71628c7653c465848433fd603ef1fb7 -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -6046 - -config.pri -file - - - - -2011-03-23T00:27:30.456916Z -d8f24af5e119c925205281c45af07360 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -98 - diff -Nru touchegg-0.3+repack/src/touchegg/config/.svn/text-base/Config.cpp.svn-base touchegg-1.0/src/touchegg/config/.svn/text-base/Config.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/config/.svn/text-base/Config.cpp.svn-base 2011-04-27 00:51:01.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/.svn/text-base/Config.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -/** - * @file /src/touchegg/config/Config.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Config - * @author José Expósito - */ -#include "Config.h" - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -const char* Config::USR_SHARE_CONFIG_FILE = "/usr/share/touchegg/touchegg.conf"; -const char* Config::HOME_CONFIG_FILE = "/.touchegg/touchegg.conf"; -const char* Config::HOME_CONFIG_DIR = ".touchegg"; - -//------------------------------------------------------------------------------ - -Config* Config::instance = NULL; - -Config* Config::getInstance() { - if(Config::instance == NULL) - Config::instance = new Config(); - - return Config::instance; -} - -void Config::loadConfig() { - if(instance != NULL) { - delete instance; - instance = NULL; - } - Config::getInstance(); -} - - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -Config::Config() { - // Comprobamos que los archivos estén en su sitio - QFile homeFile(QDir::homePath() + HOME_CONFIG_FILE); - QFile usrFile(USR_SHARE_CONFIG_FILE); - - if(!usrFile.exists()) { - qFatal("%s not found, reinstall application can solve the problem\n", - USR_SHARE_CONFIG_FILE); - } - - if(!homeFile.exists()) { - qDebug() << QDir::homePath() + HOME_CONFIG_FILE - << " not found, copying config from " - << USR_SHARE_CONFIG_FILE; - QDir::home().mkdir(HOME_CONFIG_DIR); - usrFile.copy(QDir::homePath() + HOME_CONFIG_FILE); - } - - qDebug() << "Reading config from " << QDir::homePath() + HOME_CONFIG_FILE; - this->initConfig(homeFile); -} - -// ************************************************************************** // -// ********** PRIVATE METHODS ********** // -// ************************************************************************** // - -void Config::initConfig(QFile& file) { - file.open(QIODevice::ReadOnly); - - while(!file.atEnd()) { - QString line(file.readLine()); - line = line.trimmed(); - int index = line.indexOf("="); - - if(line != "" && index != -1) { - // Guardamos el valor en el QHash - QString key = line.left(index); - QString value = line.mid(index+1); - this->settings.insert(key, value); - - // Si es un gesto y está en uso, lo añadimos a la usedGestures - QStringList aux = key.split("."); - if(aux.size() == 3 && aux.at(2) == "action" - && value != "" && value != "NO_ACTION") { - QStringList geisEquiv = GestureTypeEnum::getGeisEquivalent( - GestureTypeEnum::getEnum(aux.at(0))); - this->usedGestures.append(geisEquiv); - } - } - } - - this->usedGestures.removeDuplicates(); - file.close(); -} - - -// ************************************************************************** // -// ********** GET/SET/IS ********** // -// ************************************************************************** // - -QStringList Config::getUsedGestures() const { - return this->usedGestures; -} - -//------------------------------------------------------------------------------ - -int Config::getTapAndHoldTime() const { - bool ok; - int ret = this->settings.value( - "general_settings.tap_and_hold_time").toInt(&ok); - return ok ? ret : 135; -} - -//------------------------------------------------------------------------------ - -ActionTypeEnum::ActionType Config::getAssociatedAction( - GestureTypeEnum::GestureType gestureType, QString appClass) const { - QString gesture = GestureTypeEnum::getValue(gestureType); - QString keyWithClass = gesture + "." + appClass + ".action"; - - if(this->settings.contains(keyWithClass)) { - return ActionTypeEnum::getEnum(this->settings.value(keyWithClass)); - } else { - QString key = gesture + ".ALL.action"; - return ActionTypeEnum::getEnum(this->settings.value(key)); - } -} - -QString Config::getAssociatedSettings(GestureTypeEnum::GestureType - gestureType, QString appClass) const { - QString gesture = GestureTypeEnum::getValue(gestureType); - QString keyWithClass = gesture + "." + appClass + ".settings"; - - if(this->settings.contains(keyWithClass)) { - return this->settings.value(keyWithClass); - } else { - QString key = gesture + ".ALL.settings"; - return this->settings.value(key); - } -} diff -Nru touchegg-0.3+repack/src/touchegg/config/.svn/text-base/Config.h.svn-base touchegg-1.0/src/touchegg/config/.svn/text-base/Config.h.svn-base --- touchegg-0.3+repack/src/touchegg/config/.svn/text-base/Config.h.svn-base 2011-04-27 00:51:05.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/.svn/text-base/Config.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,187 +0,0 @@ -/** - * @file /src/touchegg/config/Config.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Config - * @author José Expósito - */ -#ifndef CONFIG_H -#define CONFIG_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/gestures/types/GestureTypeEnum.h" -#include "src/touchegg/actions/types/ActionTypeEnum.h" - -/** - * @~spanish - * Singleton que facilita el acceso a la configuración. - * - * @~english - * Singleton that provides access to the configuration. - */ -class Config { - - private: - - // Constants to access to the settings - static const char* USR_SHARE_CONFIG_FILE; - static const char* HOME_CONFIG_FILE; // Sumarle el $HOME por delante - static const char* HOME_CONFIG_DIR; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * QHash con la configuración. - * @see initConfig() - * - * @~english - * QHash with the configuration. - * @see initConfig() - */ - QHash settings; - - /** - * @~spanish - * Lista con los gestos utilizados por Touchégg, es decir, todos los que - * tengan alguna acción asociada. - * Se encuentran directamente en el formato utilizado por GEIS para - * suscribirse a los mismo. - * - * @~english - * List with the gestures used by Touchégg, this is, all gestures with - * an asocied action to it. - * They are saved directly in the format used for GEIS to subscribe to - * this gestures. - */ - QStringList usedGestures; - - /** - * @~spanish - * Inicializa el QHash que contiene la configuración. Dicho QHash tendrá - * como clave una cadena del tipo "TWO_FINGERS_TAP.ALL.action" y como - * valor, en este caso, la acción correspondiente. - * @param file Archivo desde el que leer la configuración. - * - * @~english - * Initializes the QHas that contains the settings. This QHash will have - * as key a string like "TWO_FINGERS_TAP.ALL.action" and as value, in - * this case, the action. - * @param file File from which to read configuration. - */ - void initConfig(QFile& file); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static Config* instance; - - // Hide constructors - Config(); - Config(const Config&); - const Config& operator = (const Config&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static Config* getInstance(); - - /** - * @~spanish - * (Re)Carga la configuración. - * - * @~english - * (Re)Load configuration. - */ - static void loadConfig(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve una lista de todos los gestos con una acción asociada. - * Se encuentran directamente en el formato utilizado por GEIS para - * suscribirse a los mismo. - * @return Dicha lista. - * - * @~english - * Returns a list with all gestures with an associate action. - * They are saved directly in the format used for GEIS to subscribe to - * this gestures. - * @return The list. - */ - QStringList getUsedGestures() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tiempo, en milisegundos, en el que se puede ejecutar un - * tap&hold. - * @return El tiempo. - * - * @~english - * Returns the time, in milliseconds, which can run a tap & hold. - * @return The time. - */ - int getTapAndHoldTime() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tipo de acción asociada a el gesto indicado. - * @param gestureType El gesto que se realiza. - * @param appClass Aplicación sobre la que se realiza el gesto. - * @return Tipo de la acción asociada. - * - * @~english - * Returns the associated action type with a gesture. - * @param gestureType The gesture that is made. - * @param appClass Application where it is made ​​the gesture. - * @return Type of associated action. - */ - ActionTypeEnum::ActionType getAssociatedAction( - GestureTypeEnum::GestureType gestureType, QString appClass) - const; - - /** - * @~spanish - * Devuelve la configuración de la acción asocada a un gesto indicado. - * @param gestureType Gesto indicado. - * @param appClass Aplicación sobre la que se realiza el gesto. - * @return La configuración. - * - * @~english - * Returns the associated config with the indicated gesture. - * @param gestureType The gesture. - * @param appClass Application where it is made ​​the gesture. - * @return The settings. - */ - QString getAssociatedSettings(GestureTypeEnum::GestureType - gestureType, QString appClass) const; - -}; - -#endif // CONFIG_H diff -Nru touchegg-0.3+repack/src/touchegg/config/.svn/text-base/config.pri.svn-base touchegg-1.0/src/touchegg/config/.svn/text-base/config.pri.svn-base --- touchegg-0.3+repack/src/touchegg/config/.svn/text-base/config.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/config/.svn/text-base/config.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/config/Config.h - -SOURCES += \ - src/touchegg/config/Config.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/GestureCollector.cpp touchegg-1.0/src/touchegg/gestures/collector/GestureCollector.cpp --- touchegg-0.3+repack/src/touchegg/gestures/collector/GestureCollector.cpp 2011-04-17 17:44:48.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/GestureCollector.cpp 2011-09-03 18:50:50.000000000 +0000 @@ -1,189 +1,241 @@ /** * @file /src/touchegg/gestures/collector/GestureCollector.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureCollector - * @author José Expósito */ #include "GestureCollector.h" - // ************************************************************************** // // ********** STATIC METHODS AND VARIABLES ********** // // ************************************************************************** // -void GestureCollector::deviceAdded(void* cookie, GeisInputDeviceId /*id*/, - void* /*attrs*/) { - GestureCollector* gc = (GestureCollector*)cookie; - gc->semDevices->release(); +void GestureCollector::gestureStart(GestureCollector *gc, GeisEvent event) +{ + // type is GEIS_GESTURE_TYPE_TAP1, GEIS_GESTURE_TYPE_PINCH3... + QHash attrs = getGestureAttrs(event); + QString type = attrs.value( + GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); + int id = attrs.value("geis gesture class id").toInt(); + emit gc->executeGestureStart(type, id, attrs); } -void GestureCollector::deviceRemoved(void* cookie, GeisInputDeviceId /*id*/, - void* /*attrs*/) { - GestureCollector* gc = (GestureCollector*)cookie; - gc->semDevices->acquire(); +void GestureCollector::gestureUpdate(GestureCollector *gc, GeisEvent event) +{ + QHash attrs = getGestureAttrs(event); + QString type = attrs.value( + GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); + int id = attrs.value("geis gesture class id").toInt(); + emit gc->executeGestureUpdate(type, id, attrs); } -//------------------------------------------------------------------------------ +void GestureCollector::gestureFinish(GestureCollector *gc, GeisEvent event) +{ + QHash attrs = getGestureAttrs(event); + QString type = attrs.value( + GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); + int id = attrs.value("geis gesture class id").toInt(); + emit gc->executeGestureFinish(type, id, attrs); +} -void GestureCollector::gestureAdded(void* /*cookie*/, GeisGestureType /*type*/, - GeisGestureId /*id*/, GeisSize /*numAttrs*/, - GeisGestureAttr* /*attrs*/) {} -void GestureCollector::gestureRemoved(void* /*cookie*/, GeisGestureType/*type*/, - GeisGestureId /*id*/, GeisSize /*numAttrs*/, - GeisGestureAttr* /*attrs*/) {} +// ************************************************************************** // +// ********** CONSTRUCTORS AND DESTRUCTOR ********** // +// ************************************************************************** // + +GestureCollector::GestureCollector() +{ + /* La instancia de GEIS es única, por lo que se puede tener un único bucle + * para recoger los gestos en run(). Con GEIS v2.0 se pueden añadir + * subcripciones a dicha instancia para escuchar en diferentes ventanas. + */ + this->geis = geis_new(GEIS_INIT_TRACK_DEVICES, NULL); + + if (!this->geis) + qFatal("Failed to initialize geis instance"); -void GestureCollector::gestureStart(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureStart(type, id, getGestureAttrs(numAttrs, attrs)); -} -void GestureCollector::gestureUpdate(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureUpdate(type, id, getGestureAttrs(numAttrs, attrs)); + // Inicilizamos el socket que recibirá los eventos de uTouch + int fd; + geis_get_configuration(this->geis, GEIS_CONFIGURATION_FD, &fd); + this->socketNotifier = new QSocketNotifier(fd, QSocketNotifier::Read, this); + connect(this->socketNotifier, SIGNAL(activated(int)), SLOT(geisEvent())); } -void GestureCollector::gestureFinish(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureFinish(type, id, getGestureAttrs(numAttrs, attrs)); +GestureCollector::~GestureCollector() +{ + geis_delete(this->geis); + delete this->socketNotifier; } // ************************************************************************** // -// ********** PRIVATE METHODS ********** // +// ********** PROTECTED METHOS ********** // // ************************************************************************** // -QHash GestureCollector::getGestureAttrs(GeisSize numAttrs, - GeisGestureAttr* attrs) { - QHash ret; - - for(unsigned int n=0; ngeis); + if (status != GEIS_STATUS_SUCCESS) { + qWarning("Failed to dispatch geis events"); + return; + } - switch (attrs[n].type) { - case GEIS_ATTR_TYPE_BOOLEAN: - value = attrs[n].boolean_val; + GeisEvent event; + for (status = geis_next_event(this->geis, &event); + status == GEIS_STATUS_SUCCESS || status == GEIS_STATUS_CONTINUE; + status = geis_next_event(this->geis, &event)) { + switch (geis_event_type(event)) { + case GEIS_EVENT_GESTURE_BEGIN: + GestureCollector::gestureStart(this, event); break; - case GEIS_ATTR_TYPE_FLOAT: - value = attrs[n].float_val; + case GEIS_EVENT_GESTURE_UPDATE: + GestureCollector::gestureUpdate(this, event); break; - case GEIS_ATTR_TYPE_INTEGER: - value = attrs[n].integer_val; + case GEIS_EVENT_GESTURE_END: + GestureCollector::gestureFinish(this, event); break; - case GEIS_ATTR_TYPE_STRING: - value = attrs[n].string_val; + case GEIS_EVENT_INIT_COMPLETE: + emit this->ready(); break; - case GEIS_ATTR_TYPE_POINTER: - case GEIS_ATTR_TYPE_UNKNOWN: + + default: break; } - ret.insert(attrs[n].name, value); + geis_event_delete(event); } - - return ret; } // ************************************************************************** // -// ********** PROTECTED METHOS ********** // +// ********** PUBLIC METHODS ********** // // ************************************************************************** // -void GestureCollector::run() { - this->semDevices = new QSemaphore(0); - - GeisXcbWinInfo xcbWinInfo; - xcbWinInfo.display_name = NULL; - xcbWinInfo.screenp = NULL; - xcbWinInfo.window_id = QX11Info::appRootWindow(); // All gestures - - GeisWinInfo winInfo; - winInfo.win_type = GEIS_XCB_FULL_WINDOW; - winInfo.win_info = &xcbWinInfo; - - // Inicializamos geis - GeisInstance geisInstance; - if(geis_init(&winInfo, &geisInstance) != GEIS_STATUS_SUCCESS) { - qFatal("geis_init: Can't initialize utouch-geis"); - } - - // Estamos atentos a si se conectan o desconectan dispositivos de entrada - // para no recoger gestos si no hay ninguno conectado - GeisInputFuncs devicesFuncs; - devicesFuncs.added = GestureCollector::deviceAdded; - devicesFuncs.removed = GestureCollector::deviceRemoved; - geis_input_devices(geisInstance, &devicesFuncs, this); - - // Establecemos las funciones de callback - GeisGestureFuncs gestureFuncs; - gestureFuncs.added = GestureCollector::gestureAdded; - gestureFuncs.removed = GestureCollector::gestureRemoved; - gestureFuncs.start = GestureCollector::gestureStart; - gestureFuncs.update = GestureCollector::gestureUpdate; - gestureFuncs.finish = GestureCollector::gestureFinish; - - // Nos suscribimos solo a los gestos que se vayan a usar +void GestureCollector::addWindow(Window w) +{ + // Si no hay que escuchar por ningún gesto en la ventana indicada salimos Config* cfg = Config::getInstance(); - QStringList subscribeList = cfg->getUsedGestures(); - if(subscribeList.length() == 0) - qFatal("Exiting, no gestures added to the configuration"); - char** subscribe = new char*[subscribeList.size() + 1]; - - // Pasamos de QStringList a char** - for (int i = 0; i < subscribeList.size(); i++) { - subscribe[i] = new char[ - strlen(subscribeList.at(i).toStdString().c_str())+1]; - memcpy(subscribe[i], subscribeList.at(i).toStdString().c_str(), - strlen(subscribeList.at(i).toStdString().c_str())+1); + + QList< QPair > subscribeList; + if (w == QX11Info::appRootWindow()) + subscribeList = cfg->getUsedGestures("All"); + else + subscribeList = cfg->getUsedGestures(this->getWindowClass(w)); + + if (subscribeList.length() == 0) + return; + + // Nos suscribimos solo a los gestos que nos interesan + for (int n=0; n aux = subscribeList.at(n); + int numFingers = aux.second; + + foreach (QString gesture, aux.first) { + // Creamos el filtro + GeisFilter filter = geis_filter_new(this->geis, "filter"); + + geis_filter_add_term(filter, + GEIS_FILTER_CLASS, + GEIS_GESTURE_ATTRIBUTE_TOUCHES, GEIS_FILTER_OP_EQ, + numFingers, + GEIS_CLASS_ATTRIBUTE_NAME, GEIS_FILTER_OP_EQ, + gesture.toStdString().c_str(), + NULL); + + // Escuchamos en la ventana indicada + geis_filter_add_term(filter, GEIS_FILTER_REGION, + GEIS_REGION_ATTRIBUTE_WINDOWID, GEIS_FILTER_OP_EQ, w); + + // Creamos la subcripción, le añadimos el filtro y la activamos + GeisSubscription subscription = geis_subscription_new( + this->geis, "subscription", GEIS_SUBSCRIPTION_CONT); + geis_subscription_add_filter(subscription, filter); + geis_subscription_activate(subscription); + } } - subscribe[subscribeList.size()] = ((char)NULL); +} - if(geis_subscribe(geisInstance, GEIS_ALL_INPUT_DEVICES, - (const char**)subscribe, &gestureFuncs, this) - != GEIS_STATUS_SUCCESS) - qFatal("geis_subscribe: Can't subscribe to gestures"); +void GestureCollector::removeWindow(Window /*w*/) +{ + // Si se intenta eliminar peta aleatoriamente +} - // Liberamos el char** - int i = 0; - while (subscribe[i]) { - delete subscribe[i]; - i++; - } - delete subscribe; +// ************************************************************************** // +// ********** PRIVATE METHODS ********** // +// ************************************************************************** // - // Obtenemos los gestos - int fd = -1; - geis_configuration_get_value(geisInstance, GEIS_CONFIG_UNIX_FD, &fd); - - fd_set read_fds; - for(;;) { - // Si no hay dispositivos conectados esperamos - if(this->semDevices->available() == 0) - this->semDevices->acquire(); - - FD_ZERO(&read_fds); - FD_SET(fd, &read_fds); - int sstat = select(fd+1, &read_fds, NULL, NULL, NULL); +QHash GestureCollector::getGestureAttrs(GeisEvent event) +{ + QHash ret; - if (sstat < 0) - qFatal("Error"); + GeisAttr attr = geis_event_attr_by_name(event, GEIS_EVENT_ATTRIBUTE_GROUPSET); + GeisGroupSet groupset = (GeisGroupSet)geis_attr_value_to_pointer(attr); - if (FD_ISSET(fd, &read_fds)) - geis_event_dispatch(geisInstance); + for (GeisSize i= 0; i < geis_groupset_group_count(groupset); ++i) { + GeisSize j; + GeisGroup group = geis_groupset_group(groupset, i); + + for (j=0; j < geis_group_frame_count(group); ++j) { + GeisSize k; + GeisFrame frame = geis_group_frame(group, j); + GeisSize attr_count = geis_frame_attr_count(frame); + + for (k = 0; k < attr_count; ++k) { + GeisAttr gestureAttr = geis_frame_attr(frame, k); + QString attrName = geis_attr_name(gestureAttr); + QVariant value; + + switch (geis_attr_type(gestureAttr)) { + case GEIS_ATTR_TYPE_BOOLEAN: + value = geis_attr_value_to_boolean(gestureAttr); + break; + case GEIS_ATTR_TYPE_FLOAT: + value = geis_attr_value_to_float(gestureAttr); + break; + case GEIS_ATTR_TYPE_INTEGER: + value = geis_attr_value_to_integer(gestureAttr); + break; + case GEIS_ATTR_TYPE_STRING: + value = geis_attr_value_to_string(gestureAttr); + break; + default: + break; + } + + if (!value.isNull()) { + ret.insert(attrName, value); + } + } + } } - geis_finish(geisInstance); - delete this->semDevices; + return ret; +} + +QString GestureCollector::getWindowClass(Window window) const +{ + XClassHint* classHint = XAllocClassHint(); + XGetClassHint(QX11Info::display(), window, classHint); + QString ret = classHint->res_class; + XFree(classHint->res_class); + XFree(classHint->res_name); + return ret; } diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/GestureCollector.h touchegg-1.0/src/touchegg/gestures/collector/GestureCollector.h --- touchegg-0.3+repack/src/touchegg/gestures/collector/GestureCollector.h 2011-04-09 08:49:13.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/GestureCollector.h 2011-09-03 18:50:50.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/gestures/collector/GestureCollector.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. + * + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * You should have received a copy of the GNU General Public License along with + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class GestureCollector - * @author José Expósito */ #ifndef GESTURECOLLECTOR_H #define GESTURECOLLECTOR_H @@ -26,250 +32,186 @@ * @~snglish * Collect all the gestures using utouch-geis and emits signals to report it. */ -class GestureCollector : public QThread { - +class GestureCollector : public QObject +{ Q_OBJECT - private: - - /** - * @~spanish - * Semaforo que bloquea la recogida de gestos mientras que no haya - * dispositivos de entrada conectados. - * - * @~english - * Semaphore that blocks the gesture collection while not have any input device. - */ - QSemaphore* semDevices; - - /** - * @~spanish - * Devuelve un QHash con todos los atributos de un gesto, siendo la - * clave el nombre del atributo (por ejemplo "focus x", "touches"...) y - * el valor el valor del propio atributo. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * @return El QHash - * - * @~english - * Returns a Hash with all attributes of a gesture, where the key is the - * name of the attribute (ie "focus x", "touches") and the value the - * value of the attribute. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - * @return The hash. - */ - static QHash getGestureAttrs(GeisSize numAttrs, - GeisGestureAttr* attrs); - - protected: - - /** - * @~spanish - * Función de inicio del hilo. - * - * @~english - * Thread start function. - */ - void run(); - - public: - - /** - * @~spanish - * Se llama siempre que se añada un dispositivo de entrada. - * @param cookie Puntero a la propia clase. - * @param id ID del dispositivo - * @param attrs Lista de atributos recibidos - * - * @english - * Callback function that is called when a input device is added. - * @param cookie Pointer to the class itself. - * @param id ID of the device. - * @param attrs List od attributes of the device. - */ - static void deviceAdded(void* cookie,GeisInputDeviceId id,void* attrs); - - /** - * @~spanish - * Se llama siempre que se quite un dispositivo de entrada. - * @param cookie Puntero a la propia clase. - * @param id ID del dispositivo - * @param attrs Lista de atributos recibidos - * - * @english - * Callback function that is called when a input device is removed. - * @param cookie Pointer to the class itself. - * @param id ID of the device. - * @param attrs List od attributes of the device. - */ - static void deviceRemoved(void*cookie,GeisInputDeviceId id,void* attrs); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Función callback que se llamará cuando se añada un nuevo gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is added. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureAdded(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se elimine gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is removed. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureRemoved(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se inicie un gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture starts. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureStart(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se actualice un gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is updated. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureUpdate(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando un gesto finalice. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is finished. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureFinish(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - - signals: - - /** - * @~spanish - * Señal que se emitirá cuando un gesto se inicie. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture starts. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureStart(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Señal que se emitirá cuando un gesto se actualize. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture updates. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureUpdate(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Señal que se emitirá cuando un gesto finaliza. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture finish. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureFinish(GeisGestureType type, GeisGestureId id, - const QHash& attrs); +private: + /** + * @~spanish + * Instancia de GEIS v2.0 API. + * + * @~english + * Single instance of the GEIS v2.0 API. + */ + Geis geis; + + /** + * @~spanish + * Socket notifier que emitirá una señal activated() cada vez que se + * produzca un gesto. + * + * @~english + * Socket notifier that will emit a activated() signal whenever a gestures + * is produced. + */ + QSocketNotifier* socketNotifier; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve un QHash con todos los atributos de un gesto, siendo la + * clave el nombre del atributo (por ejemplo "focus x", "touches"...) y + * el valor el valor del propio atributo. + * @param event Información del gesto. + * @return El QHash + * + * @~english + * Returns a Hash with all attributes of a gesture, where the key is the + * name of the attribute (ie "focus x", "touches") and the value the + * value of the attribute. + * @param event Information of the gesture. + * @return The hash. + */ + static QHash getGestureAttrs(GeisEvent event); + + /** + * @~spanish + * Devuelve la clase de la ventana especificada. + * @param window Dicha ventana. + * @return La clase. + * + * @~english + * Returns the class of the specified window. + * @param window This window. + * @return The class. + */ + QString getWindowClass(Window window) const; + +private slots: + + /** + * @~spanish + * Slot que es llamada cada vez que un gesto se genera. + * + * @~english + * Slot that is called whenever a gesture is generated. + */ + void geisEvent(); + +public: + + /** + * @~spanish + * Crea un GestureCollector para escuchar los eventos multitouch de la + * ventana indicada. + * @param w Dicha ventana. + * + * @~english + * Creates a GestureCollector to listen the multitouch events of the + * specified window. + * @param w This window. + */ + GestureCollector(); + + /** + * @~spanish + * Destructor. + * + * @~english + * Destructor. + */ + virtual ~GestureCollector(); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Añade una ventana en la que escuchar lo gestos mltitouch. + * @param w La ventana. + * + * @~english + * Adds a window where listen to multitouch gestures. + * @param w The window. + */ + void addWindow(Window w); + + /** + * @~spanish + * Elimina una ventana en la que escuchar lo gestos mltitouch. + * @param w La ventana. + * + * @~english + * Removes a window where listen to multitouch gestures. + * @param w The window. + */ + void removeWindow(Window w); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Función callback que se llamará cuando se inicie un gesto. + * @param clt Puntero a la propia clase. + * @param event Evento con la información del gesto. + * + * @~english + * Callback function that is called when a gesture starts. + * @param clt Pointer to the class itself. + * @param event Event with the gesture information. + */ + static void gestureStart(GestureCollector *gc, GeisEvent event); + + /// @see gestureStart() + static void gestureUpdate(GestureCollector *gc, GeisEvent event); + + /// @see gestureStart() + static void gestureFinish(GestureCollector *gc, GeisEvent event); + +signals: + + /** + * @~spanish + * Señal que se emitirá cuando un gesto se inicie. + * @param type Tipo del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * @param w ID de la ventana asociada al GestureCollector. + * @param wClass Clase de la ventana asociada al GestureCollector. + * + * @~english + * Signal is emitted when a gesture starts. + * @param type Gesture type. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + * @param w ID of the window associated to the GestureCollector. + * @param wClass Class of the window associated to the GestureCollector. + */ + void executeGestureStart(const QString &type, int id, + const QHash& attrs); + + /// @see executeGestureStart() + void executeGestureUpdate(const QString &type, int id, + const QHash& attrs); + + /// @see executeGestureStart() + void executeGestureFinish(const QString &type, int id, + const QHash& attrs); + + /** + * @~spanish + * Señal que se emite cuando uTouch está inicializado. + * + * @~english + * Signal emited when uTouch is inicializzed. + */ + void ready(); }; #endif // GESTURECOLLECTOR_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/collector/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/all-wcprops 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 57 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/collector -END -gestures.collector.pri -K 25 -svn:wc:ra_dav:version-url -V 80 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/collector/gestures.collector.pri -END -GestureCollector.cpp -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/109/touchegg/src/touchegg/gestures/collector/GestureCollector.cpp -END -GestureCollector.h -K 25 -svn:wc:ra_dav:version-url -V 77 -/svn/!svn/ver/104/touchegg/src/touchegg/gestures/collector/GestureCollector.h -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/entries touchegg-1.0/src/touchegg/gestures/collector/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/entries 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures/collector -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -gestures.collector.pri -file - - - - -2011-03-23T00:27:30.392916Z -4764103021729f907f34b38a1b3458c0 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -139 - -GestureCollector.cpp -file -109 - - - -2011-04-17T17:44:48.654740Z -2819951bc020af8fd797e41f8afbd889 -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -6629 - -GestureCollector.h -file -104 - - - -2011-04-07T23:59:32.060711Z -7e5e2f55ce940d98db3ead478b6d7c0e -2011-04-08T00:04:54.439397Z -104 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -10638 - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.cpp.svn-base touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.cpp.svn-base 2011-04-27 00:51:02.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,189 +0,0 @@ -/** - * @file /src/touchegg/gestures/collector/GestureCollector.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureCollector - * @author José Expósito - */ -#include "GestureCollector.h" - - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -void GestureCollector::deviceAdded(void* cookie, GeisInputDeviceId /*id*/, - void* /*attrs*/) { - GestureCollector* gc = (GestureCollector*)cookie; - gc->semDevices->release(); -} - -void GestureCollector::deviceRemoved(void* cookie, GeisInputDeviceId /*id*/, - void* /*attrs*/) { - GestureCollector* gc = (GestureCollector*)cookie; - gc->semDevices->acquire(); -} - -//------------------------------------------------------------------------------ - -void GestureCollector::gestureAdded(void* /*cookie*/, GeisGestureType /*type*/, - GeisGestureId /*id*/, GeisSize /*numAttrs*/, - GeisGestureAttr* /*attrs*/) {} - -void GestureCollector::gestureRemoved(void* /*cookie*/, GeisGestureType/*type*/, - GeisGestureId /*id*/, GeisSize /*numAttrs*/, - GeisGestureAttr* /*attrs*/) {} - -void GestureCollector::gestureStart(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureStart(type, id, getGestureAttrs(numAttrs, attrs)); -} - -void GestureCollector::gestureUpdate(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureUpdate(type, id, getGestureAttrs(numAttrs, attrs)); -} - -void GestureCollector::gestureFinish(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs) { - GestureCollector* gc = (GestureCollector*)cookie; - emit gc->executeGestureFinish(type, id, getGestureAttrs(numAttrs, attrs)); -} - - -// ************************************************************************** // -// ********** PRIVATE METHODS ********** // -// ************************************************************************** // - -QHash GestureCollector::getGestureAttrs(GeisSize numAttrs, - GeisGestureAttr* attrs) { - QHash ret; - - for(unsigned int n=0; nsemDevices = new QSemaphore(0); - - GeisXcbWinInfo xcbWinInfo; - xcbWinInfo.display_name = NULL; - xcbWinInfo.screenp = NULL; - xcbWinInfo.window_id = QX11Info::appRootWindow(); // All gestures - - GeisWinInfo winInfo; - winInfo.win_type = GEIS_XCB_FULL_WINDOW; - winInfo.win_info = &xcbWinInfo; - - // Inicializamos geis - GeisInstance geisInstance; - if(geis_init(&winInfo, &geisInstance) != GEIS_STATUS_SUCCESS) { - qFatal("geis_init: Can't initialize utouch-geis"); - } - - // Estamos atentos a si se conectan o desconectan dispositivos de entrada - // para no recoger gestos si no hay ninguno conectado - GeisInputFuncs devicesFuncs; - devicesFuncs.added = GestureCollector::deviceAdded; - devicesFuncs.removed = GestureCollector::deviceRemoved; - geis_input_devices(geisInstance, &devicesFuncs, this); - - // Establecemos las funciones de callback - GeisGestureFuncs gestureFuncs; - gestureFuncs.added = GestureCollector::gestureAdded; - gestureFuncs.removed = GestureCollector::gestureRemoved; - gestureFuncs.start = GestureCollector::gestureStart; - gestureFuncs.update = GestureCollector::gestureUpdate; - gestureFuncs.finish = GestureCollector::gestureFinish; - - // Nos suscribimos solo a los gestos que se vayan a usar - Config* cfg = Config::getInstance(); - QStringList subscribeList = cfg->getUsedGestures(); - if(subscribeList.length() == 0) - qFatal("Exiting, no gestures added to the configuration"); - char** subscribe = new char*[subscribeList.size() + 1]; - - // Pasamos de QStringList a char** - for (int i = 0; i < subscribeList.size(); i++) { - subscribe[i] = new char[ - strlen(subscribeList.at(i).toStdString().c_str())+1]; - memcpy(subscribe[i], subscribeList.at(i).toStdString().c_str(), - strlen(subscribeList.at(i).toStdString().c_str())+1); - } - subscribe[subscribeList.size()] = ((char)NULL); - - if(geis_subscribe(geisInstance, GEIS_ALL_INPUT_DEVICES, - (const char**)subscribe, &gestureFuncs, this) - != GEIS_STATUS_SUCCESS) - qFatal("geis_subscribe: Can't subscribe to gestures"); - - - // Liberamos el char** - int i = 0; - while (subscribe[i]) { - delete subscribe[i]; - i++; - } - delete subscribe; - - // Obtenemos los gestos - int fd = -1; - geis_configuration_get_value(geisInstance, GEIS_CONFIG_UNIX_FD, &fd); - - fd_set read_fds; - for(;;) { - // Si no hay dispositivos conectados esperamos - if(this->semDevices->available() == 0) - this->semDevices->acquire(); - - FD_ZERO(&read_fds); - FD_SET(fd, &read_fds); - int sstat = select(fd+1, &read_fds, NULL, NULL, NULL); - - if (sstat < 0) - qFatal("Error"); - - if (FD_ISSET(fd, &read_fds)) - geis_event_dispatch(geisInstance); - } - - geis_finish(geisInstance); - delete this->semDevices; -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.h.svn-base touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.h.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.h.svn-base 2011-04-08 00:04:56.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/GestureCollector.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,275 +0,0 @@ -/** - * @file /src/touchegg/gestures/collector/GestureCollector.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureCollector - * @author José Expósito - */ -#ifndef GESTURECOLLECTOR_H -#define GESTURECOLLECTOR_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/config/Config.h" - -/** - * @~spanish - * Recoge todos los gestos haciendo uso de utouch-geis y emite señales para - * informar de ello. - * - * @~snglish - * Collect all the gestures using utouch-geis and emits signals to report it. - */ -class GestureCollector : public QThread { - - Q_OBJECT - - private: - - /** - * @~spanish - * Semaforo que bloquea la recogida de gestos mientras que no haya - * dispositivos de entrada conectados. - * - * @~english - * Semaphore that blocks the gesture collection while not have any input device. - */ - QSemaphore* semDevices; - - /** - * @~spanish - * Devuelve un QHash con todos los atributos de un gesto, siendo la - * clave el nombre del atributo (por ejemplo "focus x", "touches"...) y - * el valor el valor del propio atributo. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * @return El QHash - * - * @~english - * Returns a Hash with all attributes of a gesture, where the key is the - * name of the attribute (ie "focus x", "touches") and the value the - * value of the attribute. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - * @return The hash. - */ - static QHash getGestureAttrs(GeisSize numAttrs, - GeisGestureAttr* attrs); - - protected: - - /** - * @~spanish - * Función de inicio del hilo. - * - * @~english - * Thread start function. - */ - void run(); - - public: - - /** - * @~spanish - * Se llama siempre que se añada un dispositivo de entrada. - * @param cookie Puntero a la propia clase. - * @param id ID del dispositivo - * @param attrs Lista de atributos recibidos - * - * @english - * Callback function that is called when a input device is added. - * @param cookie Pointer to the class itself. - * @param id ID of the device. - * @param attrs List od attributes of the device. - */ - static void deviceAdded(void* cookie,GeisInputDeviceId id,void* attrs); - - /** - * @~spanish - * Se llama siempre que se quite un dispositivo de entrada. - * @param cookie Puntero a la propia clase. - * @param id ID del dispositivo - * @param attrs Lista de atributos recibidos - * - * @english - * Callback function that is called when a input device is removed. - * @param cookie Pointer to the class itself. - * @param id ID of the device. - * @param attrs List od attributes of the device. - */ - static void deviceRemoved(void*cookie,GeisInputDeviceId id,void* attrs); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Función callback que se llamará cuando se añada un nuevo gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is added. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureAdded(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se elimine gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is removed. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureRemoved(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se inicie un gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture starts. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureStart(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando se actualice un gesto. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is updated. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureUpdate(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - /** - * @~spanish - * Función callback que se llamará cuando un gesto finalice. - * @param cookie Puntero a la propia clase. - * @param type Tipo del gesto. - * @param id Identificador único del gesto. - * @param numAttrs Número de atributos recibidos. - * @param attrs Lista de atributos recibidos. - * - * @~english - * Callback function that is called when a gesture is finished. - * @param cookie Pointer to the class itself. - * @param type Gesture type. - * @param id Unique gesture identifier. - * @param numAttrs Number of attributes received. - * @param attrs List of attributes. - */ - static void gestureFinish(void* cookie, GeisGestureType type, - GeisGestureId id, GeisSize numAttrs, GeisGestureAttr* attrs); - - - signals: - - /** - * @~spanish - * Señal que se emitirá cuando un gesto se inicie. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture starts. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureStart(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Señal que se emitirá cuando un gesto se actualize. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture updates. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureUpdate(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Señal que se emitirá cuando un gesto finaliza. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Signal is emitted when a gesture finish. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureFinish(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - -}; - -#endif // GESTURECOLLECTOR_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/gestures.collector.pri.svn-base touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/gestures.collector.pri.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/collector/.svn/text-base/gestures.collector.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/collector/.svn/text-base/gestures.collector.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -HEADERS += \ - src/touchegg/gestures/collector/GestureCollector.h - -SOURCES += \ - src/touchegg/gestures/collector/GestureCollector.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/GestureFactory.cpp touchegg-1.0/src/touchegg/gestures/factory/GestureFactory.cpp --- touchegg-0.3+repack/src/touchegg/gestures/factory/GestureFactory.cpp 2011-03-29 16:24:49.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/GestureFactory.cpp 2011-09-02 16:37:57.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/gestures/factory/GestureFactory.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureFactory - * @author José Expósito */ #include "GestureFactory.h" @@ -20,7 +26,8 @@ GestureFactory* GestureFactory::instance = NULL; -GestureFactory* GestureFactory::getInstance() { +GestureFactory* GestureFactory::getInstance() +{ if(GestureFactory::instance == NULL) GestureFactory::instance = new GestureFactory(); @@ -32,170 +39,147 @@ // ********** PUBLIC METHODS ********** // // ************************************************************************** // -Gesture* GestureFactory::createGesture(GeisGestureType /*type*/, - GeisGestureId id, QHash attrs) { - - QString type = attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_TAP2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_TAP, id, attrs); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_PINCH2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_PINCH, id, attrs); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_DRAG2) { - // TWO_FINGERS_DRAG_UP +Gesture* GestureFactory::createSimpleGesture(const QString &type, int id, + QHash attrs) +{ + int numFingers = attrs.value(GEIS_GESTURE_ATTRIBUTE_TOUCHES).toInt(); + + // TAP + if (type == GEIS_GESTURE_TYPE_TAP1 + || type == GEIS_GESTURE_TYPE_TAP2 + || type == GEIS_GESTURE_TYPE_TAP3 + || type == GEIS_GESTURE_TYPE_TAP4 + || type == GEIS_GESTURE_TYPE_TAP5) { + return new Gesture(GestureTypeEnum::TAP, numFingers, + GestureDirectionEnum::NO_DIRECTION, id, attrs); + + // DRAG + } else if (type == GEIS_GESTURE_TYPE_DRAG1 + || type == GEIS_GESTURE_TYPE_DRAG2 + || type == GEIS_GESTURE_TYPE_DRAG3 + || type == GEIS_GESTURE_TYPE_DRAG4 + || type == GEIS_GESTURE_TYPE_DRAG5) { + // UP if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_UP, - id, attrs); + return new Gesture(GestureTypeEnum::DRAG, numFingers, + GestureDirectionEnum::UP, id, attrs); - // TWO_FINGERS_DRAG_DOWN + // DOWN if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_DOWN, - id, attrs); + return new Gesture(GestureTypeEnum::DRAG, numFingers, + GestureDirectionEnum::DOWN, id, attrs); - // TWO_FINGERS_DRAG_LEFT + // LEFT if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_LEFT, - id, attrs); + return new Gesture(GestureTypeEnum::DRAG, numFingers, + GestureDirectionEnum::LEFT, id, attrs); - // TWO_FINGERS_DRAG_RIGHT + // RIGHT if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_RIGHT, - id, attrs); - } + return new Gesture(GestureTypeEnum::DRAG, numFingers, + GestureDirectionEnum::RIGHT, id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG3) { - // THREE_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_UP, - id, attrs); - - // THREE_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_DOWN, - id, attrs); - - // THREE_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_LEFT, - id, attrs); - - // THREE_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_RIGHT, - id, attrs); + // PINCH + } else if (type == GEIS_GESTURE_TYPE_PINCH1 + || type == GEIS_GESTURE_TYPE_PINCH2 + || type == GEIS_GESTURE_TYPE_PINCH3 + || type == GEIS_GESTURE_TYPE_PINCH4 + || type == GEIS_GESTURE_TYPE_PINCH5) { + // IN + if(attrs.value(GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA).toFloat() < 0) + return new Gesture(GestureTypeEnum::PINCH, numFingers, + GestureDirectionEnum::IN, id, attrs); + + // OUT + if(attrs.value(GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA).toFloat() > 0) + return new Gesture(GestureTypeEnum::PINCH, numFingers, + GestureDirectionEnum::OUT, id, attrs); + + // ROTATE + } else if (type == GEIS_GESTURE_TYPE_ROTATE1 + || type == GEIS_GESTURE_TYPE_ROTATE2 + || type == GEIS_GESTURE_TYPE_ROTATE3 + || type == GEIS_GESTURE_TYPE_ROTATE4 + || type == GEIS_GESTURE_TYPE_ROTATE5) { + // LEFT + if(attrs.value(GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA).toFloat() < 0) + return new Gesture(GestureTypeEnum::ROTATE, numFingers, + GestureDirectionEnum::LEFT, id, attrs); + + // RIGHT + if(attrs.value(GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA).toFloat() > 0) + return new Gesture(GestureTypeEnum::ROTATE, numFingers, + GestureDirectionEnum::RIGHT, id, attrs); + + // UNKNOWN GESTURE + } else { + qDebug() << "[+] Unknown gesture:"; + qDebug() << "\tName -> " << attrs.value( + GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); + qDebug() << "\tNumber of fingers-> " << attrs.value( + GEIS_GESTURE_ATTRIBUTE_TOUCHES).toInt(); } - if(type == GEIS_GESTURE_TYPE_DRAG4) { - // FOUR_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_UP, - id, attrs); - - // FOUR_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_DOWN, - id, attrs); - - // FOUR_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_LEFT, - id, attrs); + return NULL; +} - // FOUR_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_RIGHT, - id, attrs); - } +Gesture* GestureFactory::createComposedGesture(const QString &type, int id, + QHash attrs) +{ + int numFingers = attrs.value(GEIS_GESTURE_ATTRIBUTE_TOUCHES).toInt(); + + // TAP & HOLD + if (type == GEIS_GESTURE_TYPE_DRAG1 + || type == GEIS_GESTURE_TYPE_DRAG2 + || type == GEIS_GESTURE_TYPE_DRAG3 + || type == GEIS_GESTURE_TYPE_DRAG4 + || type == GEIS_GESTURE_TYPE_DRAG5) { - if(type == GEIS_GESTURE_TYPE_DRAG5) { - // FIVE_FINGERS_DRAG_UP + // UP if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_UP, - id, attrs); + return new Gesture(GestureTypeEnum::TAP_AND_HOLD, numFingers, + GestureDirectionEnum::UP, id, attrs); - // FIVE_FINGERS_DRAG_DOWN + // DOWN if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_DOWN, - id, attrs); + return new Gesture(GestureTypeEnum::TAP_AND_HOLD, numFingers, + GestureDirectionEnum::DOWN, id, attrs); - // FIVE_FINGERS_DRAG_LEFT + // LEFT if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_LEFT, - id, attrs); + return new Gesture(GestureTypeEnum::TAP_AND_HOLD, numFingers, + GestureDirectionEnum::LEFT, id, attrs); - // FIVE_FINGERS_DRAG_RIGHT + // RIGHT if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_RIGHT, - id, attrs); - } + return new Gesture(GestureTypeEnum::TAP_AND_HOLD, numFingers, + GestureDirectionEnum::RIGHT, id, attrs); - //-------------------------------------------------------------------------- + // DOUBLE TAP + } else if (type == GEIS_GESTURE_TYPE_TAP1 + || type == GEIS_GESTURE_TYPE_TAP2 + || type == GEIS_GESTURE_TYPE_TAP3 + || type == GEIS_GESTURE_TYPE_TAP4 + || type == GEIS_GESTURE_TYPE_TAP5) { + return new Gesture(GestureTypeEnum::DOUBLE_TAP, numFingers, + GestureDirectionEnum::NO_DIRECTION, id, attrs); + + // UNKNOWN GESTURE + } else { + qDebug() << "[+] Unknown gesture:"; + qDebug() << "\tName -> " << attrs.value( + GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); + qDebug() << "\tNumber of fingers-> " << attrs.value( + GEIS_GESTURE_ATTRIBUTE_TOUCHES).toInt(); + } - qDebug() << "[+] Unknown gesture:"; - qDebug() << "\tName -> " << attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME, - "Unknown name"); return NULL; } - -Gesture* GestureFactory::createTapAndHold(GeisGestureType /*type*/, - GeisGestureId id, QHash attrs) { - - QString type = attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); - - if(type == GEIS_GESTURE_TYPE_DRAG2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_TAP_AND_HOLD, - id, attrs); - - return NULL; -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/GestureFactory.h touchegg-1.0/src/touchegg/gestures/factory/GestureFactory.h --- touchegg-0.3+repack/src/touchegg/gestures/factory/GestureFactory.h 2011-03-29 16:29:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/GestureFactory.h 2011-09-02 15:42:42.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/gestures/factory/GestureFactory.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureFactory - * @author José Expósito */ #ifndef GESTUREFACTORY_H #define GESTUREFACTORY_H @@ -26,88 +32,89 @@ * @~english * Factory to create the different gestures. */ -class GestureFactory { +class GestureFactory +{ - private: +private: - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static GestureFactory* instance; - - // Hide constructors - GestureFactory(){} - GestureFactory(const GestureFactory&); - const GestureFactory& operator = (const GestureFactory&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static GestureFactory* getInstance(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Crea un gesto con las propiedades indicadas. IMPORTANTE: No olvidar - * liberar memoria. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @return El gesto. - * - * @~english - * Creates a gesture with the specified properties. IMPORTANT: Don't - * forget to free memory. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @return The gesture. - */ - Gesture* createGesture(GeisGestureType type, GeisGestureId id, + /** + * @~spanish + * Única instancia de la clase. + * + * @~english + * Single instance of the class. + */ + static GestureFactory* instance; + + // Hide constructors + GestureFactory(){} + GestureFactory(const GestureFactory&); + const GestureFactory& operator = (const GestureFactory&); + +public: + + /** + * @~spanish + * Único método para obtener una instancia de la clase. + * @return La única instancia de la clase. + * + * @~english + * Only method to get an instance of the class. + * @return The single instance of the class. + */ + static GestureFactory* getInstance(); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Crea un gesto no-compuesto con las propiedades indicadas. + * IMPORTANTE: No olvidar liberar memoria. + * @param type Tipo del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * @return El gesto. + * + * @~english + * Creates a no-composed gesture with the specified properties. + * IMPORTANT: Don't forget to free memory. + * @param type Gesture type. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + * @return The gesture. + */ + Gesture* createSimpleGesture(const QString &type, int id, QHash attrs); - /** - * @~spanish - * Como el tap&hold no es un gesto soportado directamente por uTouch, - * necesitamos construirlo de manera especial. - * IMPORTANTE: No olvidar liberar memoria. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @return El gesto. - * - * @~english - * As the tap&hold gesture is not directly supported by uTouch, is - * necesary build it a special way. - * IMPORTANT: Don't forget to free memory. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @return The gesture. - */ - Gesture* createTapAndHold(GeisGestureType type, GeisGestureId id, - QHash attrs); + /** + * @~spanish + * Crea un gesto compuesto (tap&hol, double tap...) con las propiedades + * indicadas. + * IMPORTANTE: No olvidar liberar memoria. + * @param type Tipo del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * @return El gesto. + * + * @~english + * Creates a composed gesture (tap&hold, double tap...) with the + * specified properties. + * IMPORTANT: Don't forget to free memory. + * @param type Gesture type. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + * @return The gesture. + */ + Gesture* createComposedGesture(const QString &type, int id, + QHash attrs); }; #endif // GESTUREFACTORY_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/factory/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/all-wcprops 2011-03-29 16:36:22.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/factory -END -gestures.factory.pri -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/factory/gestures.factory.pri -END -GestureFactory.cpp -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/100/touchegg/src/touchegg/gestures/factory/GestureFactory.cpp -END -GestureFactory.h -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/100/touchegg/src/touchegg/gestures/factory/GestureFactory.h -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/entries touchegg-1.0/src/touchegg/gestures/factory/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/entries 2011-03-29 16:36:22.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures/factory -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -gestures.factory.pri -file - - - - -2011-03-23T00:27:30.420916Z -67f15a9eeeb3563cd5902a7633f7d245 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -134 - -GestureFactory.cpp -file -100 - - - -2011-03-29T16:24:49.463926Z -da517d4eac5238415ed90c1513ba8a0c -2011-03-29T16:36:36.043503Z -100 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -8494 - -GestureFactory.h -file -100 - - - -2011-03-29T16:29:10.103926Z -90efa5510fa6abd62fbfed6a88a32f16 -2011-03-29T16:36:36.043503Z -100 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3825 - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.cpp.svn-base touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.cpp.svn-base 2011-03-29 16:36:20.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -/** - * @file /src/touchegg/gestures/factory/GestureFactory.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureFactory - * @author José Expósito - */ -#include "GestureFactory.h" - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -GestureFactory* GestureFactory::instance = NULL; - -GestureFactory* GestureFactory::getInstance() { - if(GestureFactory::instance == NULL) - GestureFactory::instance = new GestureFactory(); - - return GestureFactory::instance; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -Gesture* GestureFactory::createGesture(GeisGestureType /*type*/, - GeisGestureId id, QHash attrs) { - - QString type = attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_TAP2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_TAP, id, attrs); - - if(type == GEIS_GESTURE_TYPE_TAP5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_TAP, id, attrs); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_PINCH2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_PINCH, id, attrs); - - if(type == GEIS_GESTURE_TYPE_PINCH5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_PINCH, id, attrs); - - //-------------------------------------------------------------------------- - - if(type == GEIS_GESTURE_TYPE_DRAG2) { - // TWO_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_UP, - id, attrs); - - // TWO_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_DOWN, - id, attrs); - - // TWO_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_LEFT, - id, attrs); - - // TWO_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::TWO_FINGERS_DRAG_RIGHT, - id, attrs); - } - - if(type == GEIS_GESTURE_TYPE_DRAG3) { - // THREE_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_UP, - id, attrs); - - // THREE_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_DOWN, - id, attrs); - - // THREE_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_LEFT, - id, attrs); - - // THREE_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::THREE_FINGERS_DRAG_RIGHT, - id, attrs); - } - - if(type == GEIS_GESTURE_TYPE_DRAG4) { - // FOUR_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_UP, - id, attrs); - - // FOUR_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_DOWN, - id, attrs); - - // FOUR_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_LEFT, - id, attrs); - - // FOUR_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_DRAG_RIGHT, - id, attrs); - } - - if(type == GEIS_GESTURE_TYPE_DRAG5) { - // FIVE_FINGERS_DRAG_UP - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() < 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_UP, - id, attrs); - - // FIVE_FINGERS_DRAG_DOWN - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() == 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() > 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_DOWN, - id, attrs); - - // FIVE_FINGERS_DRAG_LEFT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() < 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_LEFT, - id, attrs); - - // FIVE_FINGERS_DRAG_RIGHT - if(attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_X).toFloat() > 0 - && attrs.value(GEIS_GESTURE_ATTRIBUTE_DELTA_Y).toFloat() == 0) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_DRAG_RIGHT, - id, attrs); - } - - //-------------------------------------------------------------------------- - - qDebug() << "[+] Unknown gesture:"; - qDebug() << "\tName -> " << attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME, - "Unknown name"); - return NULL; -} - -Gesture* GestureFactory::createTapAndHold(GeisGestureType /*type*/, - GeisGestureId id, QHash attrs) { - - QString type = attrs.value(GEIS_GESTURE_ATTRIBUTE_GESTURE_NAME).toString(); - - if(type == GEIS_GESTURE_TYPE_DRAG2) - return new Gesture(GestureTypeEnum::TWO_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG3) - return new Gesture(GestureTypeEnum::THREE_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG4) - return new Gesture(GestureTypeEnum::FOUR_FINGERS_TAP_AND_HOLD, - id, attrs); - if(type == GEIS_GESTURE_TYPE_DRAG5) - return new Gesture(GestureTypeEnum::FIVE_FINGERS_TAP_AND_HOLD, - id, attrs); - - return NULL; -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.h.svn-base touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.h.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.h.svn-base 2011-03-29 16:36:17.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/GestureFactory.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -/** - * @file /src/touchegg/gestures/factory/GestureFactory.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureFactory - * @author José Expósito - */ -#ifndef GESTUREFACTORY_H -#define GESTUREFACTORY_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/gestures/types/GestureTypeEnum.h" -#include "src/touchegg/gestures/implementation/Gesture.h" - -/** - * @~spanish - * Factoría para crear los distintos gestos. - * - * @~english - * Factory to create the different gestures. - */ -class GestureFactory { - - private: - - /** - * @~spanish - * Única instancia de la clase. - * - * @~english - * Single instance of the class. - */ - static GestureFactory* instance; - - // Hide constructors - GestureFactory(){} - GestureFactory(const GestureFactory&); - const GestureFactory& operator = (const GestureFactory&); - - public: - - /** - * @~spanish - * Único método para obtener una instancia de la clase. - * @return La única instancia de la clase. - * - * @~english - * Only method to get an instance of the class. - * @return The single instance of the class. - */ - static GestureFactory* getInstance(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Crea un gesto con las propiedades indicadas. IMPORTANTE: No olvidar - * liberar memoria. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @return El gesto. - * - * @~english - * Creates a gesture with the specified properties. IMPORTANT: Don't - * forget to free memory. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @return The gesture. - */ - Gesture* createGesture(GeisGestureType type, GeisGestureId id, - QHash attrs); - - /** - * @~spanish - * Como el tap&hold no es un gesto soportado directamente por uTouch, - * necesitamos construirlo de manera especial. - * IMPORTANTE: No olvidar liberar memoria. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @return El gesto. - * - * @~english - * As the tap&hold gesture is not directly supported by uTouch, is - * necesary build it a special way. - * IMPORTANT: Don't forget to free memory. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @return The gesture. - */ - Gesture* createTapAndHold(GeisGestureType type, GeisGestureId id, - QHash attrs); -}; - -#endif // GESTUREFACTORY_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/gestures.factory.pri.svn-base touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/gestures.factory.pri.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/factory/.svn/text-base/gestures.factory.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/factory/.svn/text-base/gestures.factory.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/gestures/factory/GestureFactory.h - -SOURCES += \ - src/touchegg/gestures/factory/GestureFactory.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/GestureHandler.cpp touchegg-1.0/src/touchegg/gestures/handler/GestureHandler.cpp --- touchegg-0.3+repack/src/touchegg/gestures/handler/GestureHandler.cpp 2011-04-12 15:56:45.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/GestureHandler.cpp 2011-09-02 17:42:01.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/gestures/handler/GestureHandler.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureHandler - * @author José Expósito */ #include "GestureHandler.h" @@ -18,21 +24,21 @@ // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // -GestureHandler::GestureHandler() : QThread() { +GestureHandler::GestureHandler() : QObject() +{ this->currentGesture = NULL; - this->gestureFact = GestureFactory::getInstance(); - this->actionFact = ActionFactory::getInstance(); - this->config = Config::getInstance(); + this->actionFact = ActionFactory::getInstance(); + this->config = Config::getInstance(); this->timerTap = new QTimer(this); - this->timerTap->setInterval(this->config->getTapAndHoldTime()); + this->timerTap->setInterval(this->config->getComposedGesturesTime()); connect(this->timerTap, SIGNAL(timeout()), this, SLOT(executeTap())); } -GestureHandler::~GestureHandler() { - if(this->currentGesture != NULL) - delete this->currentGesture; +GestureHandler::~GestureHandler() +{ + delete this->currentGesture; delete timerTap; } @@ -41,14 +47,16 @@ // ********** PRIVATE METHODS ********** // // ************************************************************************** // -Gesture* GestureHandler::createGesture(GeisGestureType type, GeisGestureId id, - const QHash& attrs, bool isTapAndHold) const { +Gesture* GestureHandler::createGesture(const QString &type, int id, + const QHash& attrs, bool isComposedGesture) const +{ // Creamos el gesto sin su acción Gesture* ret; - if(isTapAndHold) - ret = this->gestureFact->createTapAndHold(type, id, attrs); + if(isComposedGesture) + ret = this->gestureFact->createComposedGesture(type, id, attrs); else - ret = this->gestureFact->createGesture(type, id, attrs); + ret = this->gestureFact->createSimpleGesture(type, id, attrs); + if(ret == NULL) return NULL; @@ -60,12 +68,10 @@ QString appClass = this->getAppClass(gestureWindow); // Creamos y asignamos la acción asociada al gesto - ActionTypeEnum::ActionType actionType; - QString actionSettings; - - actionType = this->config->getAssociatedAction(ret->getType(), appClass); - actionSettings = this->config->getAssociatedSettings( - ret->getType(), appClass); + ActionTypeEnum::ActionType actionType = this->config->getAssociatedAction( + appClass, ret->getType(), ret->getNumFingers(),ret->getDirection()); + QString actionSettings = this->config->getAssociatedSettings(appClass, + ret->getType(), ret->getNumFingers(), ret->getDirection()); ret->setAction(this->actionFact->createAction(actionType, actionSettings, gestureWindow)); @@ -73,6 +79,9 @@ // Mostramos los datos sobre el gesto qDebug() << "[+] New gesture:"; qDebug() << "\tType -> " << GestureTypeEnum::getValue(ret->getType()); + qDebug() << "\tFingers -> " << ret->getNumFingers(); + qDebug() << "\tDirection -> " << GestureDirectionEnum::getValue( + ret->getDirection()); qDebug() << "\tAction -> " << ActionTypeEnum::getValue(actionType); qDebug() << "\tApp Class -> " << appClass; @@ -81,7 +90,8 @@ //------------------------------------------------------------------------------ -Window GestureHandler::getGestureWindow(Window window) const { +Window GestureHandler::getGestureWindow(Window window) const +{ Window topIn = this->getTopLevelWindow(window); if(topIn == None) return None; @@ -127,7 +137,8 @@ return ret; } -Window GestureHandler::getTopLevelWindow(Window window) const { +Window GestureHandler::getTopLevelWindow(Window window) const +{ Window root, parent; Window* children; unsigned int numChildren; @@ -147,7 +158,8 @@ } } -QString GestureHandler::getAppClass(Window window) const { +QString GestureHandler::getAppClass(Window window) const +{ XClassHint* classHint = XAllocClassHint(); XGetClassHint(QX11Info::display(), window, classHint); QString ret = classHint->res_class; @@ -161,7 +173,8 @@ // ********** PRIVATE SLOTS ********** // // ************************************************************************** // -void GestureHandler::executeTap() { +void GestureHandler::executeTap() +{ this->timerTap->stop(); if(this->currentGesture != NULL) { @@ -184,26 +197,26 @@ // ********** PUBLIC SLOTS ********** // // ************************************************************************** // -void GestureHandler::executeGestureStart(GeisGestureType type, - GeisGestureId id, const QHash& attrs) { - +void GestureHandler::executeGestureStart(const QString &type, int id, + const QHash& attrs) +{ // Si no se está ejecutando ningún gesto creamos uno nuevo if(this->currentGesture == NULL) { this->currentGesture = this->createGesture(type, id, attrs, false); if(this->currentGesture != NULL) { // Ejecutamos el gesto - qDebug() << "\tGesture Start"; + qDebug() << "\tGesture Start" << id << type; + this->currentGesture->start(); } - // Si el timer está en ejecución podemos hacer un tap&hold + // Si el timer está en ejecución podemos hacer un TAP_AND_HOLD } else if(this->timerTap->isActive()) { this->timerTap->stop(); // El nuevo gesto debe ser un drag con igual número de dedos que el tap - // en ejecución para que se considere un tap&hold - if(type == GEIS_GESTURE_PRIMITIVE_DRAG - && attrs.contains(GEIS_GESTURE_ATTRIBUTE_TOUCHES) + // en ejecución para que se considere un TAP_AND_HOLD + if(attrs.contains(GEIS_GESTURE_ATTRIBUTE_TOUCHES) && this->currentGesture->getAttrs().contains( GEIS_GESTURE_ATTRIBUTE_TOUCHES) && attrs.value(GEIS_GESTURE_ATTRIBUTE_TOUCHES) @@ -225,11 +238,14 @@ } } -void GestureHandler::executeGestureUpdate(GeisGestureType type, - GeisGestureId id,const QHash& attrs) { +void GestureHandler::executeGestureUpdate(const QString &type, int id, + const QHash& attrs) +{ // Si es un update del gesto en ejecución - if(this->currentGesture != NULL && this->currentGesture->getId() == id) { - qDebug() << "\tGesture Update"; + if(this->currentGesture != NULL + && this->currentGesture->getId() == id + && !this->timerTap->isActive()) { + qDebug() << "\tGesture Update" << id << type; this->currentGesture->setAttrs(attrs); this->currentGesture->update(); @@ -241,12 +257,45 @@ if(this->currentGesture != NULL) { this->timerTap->start(); } + + // Si se recibe un TAP con el timer en ejecución es que es un DOUBLE_TAP + } else if(this->currentGesture != NULL + && this->timerTap->isActive()) { + this->timerTap->stop(); + + // El nuevo gesto debe ser un tap con igual número de dedos que el tap + // en ejecución para que se considere un DOUBLE_TAP + if (attrs.contains(GEIS_GESTURE_ATTRIBUTE_TOUCHES) + && this->currentGesture->getAttrs().contains( + GEIS_GESTURE_ATTRIBUTE_TOUCHES) + && attrs.value(GEIS_GESTURE_ATTRIBUTE_TOUCHES) + == this->currentGesture->getAttrs().value( + GEIS_GESTURE_ATTRIBUTE_TOUCHES)) { + delete this->currentGesture; + this->currentGesture = this->createGesture(type, id, attrs, true); + + if(this->currentGesture != NULL) { + // Ejecutamos el gesto + qDebug() << "\tGesture Start"; + this->currentGesture->start(); + + qDebug() << "\tGesture Update"; + this->currentGesture->update(); + + qDebug() << "\tGesture Finish"; + this->currentGesture->finish(); + + delete this->currentGesture; + this->currentGesture = NULL; + } + } } } -void GestureHandler::executeGestureFinish(GeisGestureType /*type*/, - GeisGestureId /*id*/, const QHash& attrs) { - if(this->currentGesture != NULL) { +void GestureHandler::executeGestureFinish(const QString &/*type*/, int id, + const QHash& attrs) +{ + if(this->currentGesture != NULL && this->currentGesture->getId() == id) { qDebug() << "\tGesture Finish"; this->currentGesture->setAttrs(attrs); this->currentGesture->finish(); diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/GestureHandler.h touchegg-1.0/src/touchegg/gestures/handler/GestureHandler.h --- touchegg-0.3+repack/src/touchegg/gestures/handler/GestureHandler.h 2011-04-06 23:46:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/GestureHandler.h 2011-09-02 15:40:44.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/gestures/handler/GestureHandler.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class GestureHandler - * @author José Expósito */ #ifndef GESTUREHANDLER_H #define GESTUREHANDLER_H @@ -28,222 +34,197 @@ * Class that receives the gestures, processes it and execute the corresponding * action. */ -class GestureHandler : public QThread { +class GestureHandler : public QObject +{ Q_OBJECT - private: +private: - /** - * @~spanish - * Gesto que se está ejecutando. - * - * @~english - * Gesture that is running. - */ - Gesture* currentGesture; - - /** - * @~spanish - * Timer que ejecuta los taps siempre que el gesto no resulte ser un - * tap&hold. - * - * @~english - * Timer that running the taps always that the gesture does not prove - * to be a tap&hold. - */ - QTimer* timerTap; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Factoría para crear los gestos. - * - * @~english - * Factory to create gestures. - */ - GestureFactory* gestureFact; - - /** - * @~spanish - * Factoría para crear las acciones. - * - * @~english - * Factory to create gestures. - */ - ActionFactory* actionFact; - - /** - * @~spanish - * Provee acceso a la configurración. - * - * @~english - * Provides access to configurración. - */ - Config* config; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Crea un gesto estandar con su acción. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @param isTapAndHold Si es o no un gesto tap&hold. - * @return El gesto o NULL. - * - * @~english - * Create a estandar gesture with their action. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @param isTapAndHold If is or not a tap&hold gesture. - * @return The gesture or NULL. - */ - Gesture* createGesture(GeisGestureType type, GeisGestureId id, - const QHash& attrs, bool isTapAndHold) const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve la ventana sobre la que se produce el gesto. - * @param window Ventana que nos pasa GEIS. - * @return Dicha ventana. - * - * @~english - * Returns window over the gestures is make. - * @param window The window that GEIS returns. - * @return This window. - */ - Window getGestureWindow(Window window) const; - - /** - * @~spanish - * Devuelve la ventana de más alto nivel de la ventana indicada. - * @param window La ventana. - * @return Dicha ventana - * - * @~english - * Returns the top level window of the specified window. - * @param window The window. - * @return This window. - */ - Window getTopLevelWindow(Window window) const; - - /** - * @~spanish - * Devuelve la clase de la ventana especificada, por ejemplo, para - * cualquier ventana de XTerm la clase será "XTerm". - * @param window Dicha ventana. - * @return La clase. - * - * @~english - * Returns the class of a window, for example, "XTerm" is the class of - * all instances of XTerm. - * @param window This window. - * @return The class. - */ - QString getAppClass(Window window) const; - - private slots: - - /** - * @~spanish - * Ejecuta los taps que no han resultado ser un tap&hold. - * - * @~english - * Run the taps that have not proven to be a tap&hold. - */ - void executeTap(); - - public: - - /** - * @~spanish - * Constructor. - * - * @~english - * Constructor. - */ - GestureHandler(); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~GestureHandler(); - - public slots: - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureStart(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureUpdate(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureFinish(GeisGestureType type, GeisGestureId id, - const QHash& attrs); + /** + * @~spanish + * Gesto que se está ejecutando. + * + * @~english + * Gesture that is running. + */ + Gesture* currentGesture; + + /** + * @~spanish + * Timer que ejecuta los taps siempre que el gesto no resulte ser un + * tap&hold. + * + * @~english + * Timer that running the taps always that the gesture does not prove + * to be a tap&hold. + */ + QTimer* timerTap; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Factoría para crear los gestos. + * + * @~english + * Factory to create gestures. + */ + GestureFactory* gestureFact; + + /** + * @~spanish + * Factoría para crear las acciones. + * + * @~english + * Factory to create gestures. + */ + ActionFactory* actionFact; + + /** + * @~spanish + * Provee acceso a la configurración. + * + * @~english + * Provides access to configurración. + */ + Config* config; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Crea un gesto estandar con su acción. + * @param type Tipo del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * @param isComposedGesture Si es un gesto compuesto (tap&hold, double + * tap...) o no. + * @param gestureWindow ID de la ventana sobre la que se ejecuta el gesto. + * @param wClass Clase de la ventana sobre la que se produce el gesto. + * @return El gesto o NULL. + * + * @~english + * Create a estandar gesture with their action. + * @param type Gesture type. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + * @param isComposedGesture If is a composed gesture (tap&hold, double + * tap) or not. + * @param gestureWindow ID of the window on which the gesture occurs. + * @param wClass Class of the window on which the gesture occurs. + * @return The gesture or NULL. + */ + Gesture* createGesture(const QString &type, int id, + const QHash& attrs, bool isComposedGesture) const; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve la ventana sobre la que se produce el gesto. + * @param window Ventana que nos pasa GEIS. + * @return Dicha ventana. + * + * @~english + * Returns window over the gestures is make. + * @param window The window that GEIS returns. + * @return This window. + */ + Window getGestureWindow(Window window) const; + + /** + * @~spanish + * Devuelve la ventana de más alto nivel de la ventana indicada. + * @param window La ventana. + * @return Dicha ventana + * + * @~english + * Returns the top level window of the specified window. + * @param window The window. + * @return This window. + */ + Window getTopLevelWindow(Window window) const; + + /** + * @~spanish + * Devuelve la clase de la ventana especificada, por ejemplo, para + * cualquier ventana de XTerm la clase será "XTerm". + * @param window Dicha ventana. + * @return La clase. + * + * @~english + * Returns the class of a window, for example, "XTerm" is the class of + * all instances of XTerm. + * @param window This window. + * @return The class. + */ + QString getAppClass(Window window) const; + +private slots: + + /** + * @~spanish + * Ejecuta los taps que no han resultado ser un tap&hold. + * + * @~english + * Run the taps that have not proven to be a tap&hold. + */ + void executeTap(); + +public: + + /** + * @~spanish + * Constructor. + * + * @~english + * Constructor. + */ + GestureHandler(); + + /** + * @~spanish + * Destructor. + * + * @~english + * Destructor. + */ + virtual ~GestureHandler(); + +public slots: + + /** + * @~spanish + * Ejecuta el gesto indicado. + * @param type Tipo del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * + * @~english + * Runs the indicated gesture. + * @param type Gesture type. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + */ + void executeGestureStart(const QString &type, int id, + const QHash& attrs); + + /// @see executeGestureStart() + void executeGestureUpdate(const QString &type, int id, + const QHash& attrs); + + /// @see executeGestureStart() + void executeGestureFinish(const QString &type, int id, + const QHash& attrs); }; diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/handler/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/all-wcprops 2011-04-12 16:34:27.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/handler -END -GestureHandler.h -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/103/touchegg/src/touchegg/gestures/handler/GestureHandler.h -END -gestures.handler.pri -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/handler/gestures.handler.pri -END -GestureHandler.cpp -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/107/touchegg/src/touchegg/gestures/handler/GestureHandler.cpp -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/entries touchegg-1.0/src/touchegg/gestures/handler/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/entries 2011-04-12 16:34:27.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures/handler -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -GestureHandler.h -file -103 - - - -2011-04-06T23:46:00.207544Z -b8f20adac68f1d14fddda559bf78dd9e -2011-04-07T00:14:43.841574Z -103 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -7838 - -gestures.handler.pri -file - - - - -2011-03-23T00:27:30.444916Z -0656de7e196c20d7c767c437fb9d9ec4 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -134 - -GestureHandler.cpp -file -107 - - - -2011-04-12T15:56:45.253532Z -6a9f5f81ea9410f1a1c4c47263263058 -2011-04-12T16:34:21.446110Z -107 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -9013 - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.cpp.svn-base touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.cpp.svn-base 2011-04-12 16:34:25.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -/** - * @file /src/touchegg/gestures/handler/GestureHandler.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureHandler - * @author José Expósito - */ -#include "GestureHandler.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -GestureHandler::GestureHandler() : QThread() { - this->currentGesture = NULL; - - this->gestureFact = GestureFactory::getInstance(); - this->actionFact = ActionFactory::getInstance(); - this->config = Config::getInstance(); - - this->timerTap = new QTimer(this); - this->timerTap->setInterval(this->config->getTapAndHoldTime()); - connect(this->timerTap, SIGNAL(timeout()), this, SLOT(executeTap())); -} - -GestureHandler::~GestureHandler() { - if(this->currentGesture != NULL) - delete this->currentGesture; - delete timerTap; -} - - -// ************************************************************************** // -// ********** PRIVATE METHODS ********** // -// ************************************************************************** // - -Gesture* GestureHandler::createGesture(GeisGestureType type, GeisGestureId id, - const QHash& attrs, bool isTapAndHold) const { - // Creamos el gesto sin su acción - Gesture* ret; - if(isTapAndHold) - ret = this->gestureFact->createTapAndHold(type, id, attrs); - else - ret = this->gestureFact->createGesture(type, id, attrs); - if(ret == NULL) - return NULL; - - // Vemos sobre que ventana se ha ejecutado - Window gestureWindow = this->getGestureWindow( - attrs.value(GEIS_GESTURE_ATTRIBUTE_CHILD_WINDOW_ID).toInt()); - if(gestureWindow == None) - return NULL; - QString appClass = this->getAppClass(gestureWindow); - - // Creamos y asignamos la acción asociada al gesto - ActionTypeEnum::ActionType actionType; - QString actionSettings; - - actionType = this->config->getAssociatedAction(ret->getType(), appClass); - actionSettings = this->config->getAssociatedSettings( - ret->getType(), appClass); - - ret->setAction(this->actionFact->createAction(actionType, actionSettings, - gestureWindow)); - - // Mostramos los datos sobre el gesto - qDebug() << "[+] New gesture:"; - qDebug() << "\tType -> " << GestureTypeEnum::getValue(ret->getType()); - qDebug() << "\tAction -> " << ActionTypeEnum::getValue(actionType); - qDebug() << "\tApp Class -> " << appClass; - - return ret; -} - -//------------------------------------------------------------------------------ - -Window GestureHandler::getGestureWindow(Window window) const { - Window topIn = this->getTopLevelWindow(window); - if(topIn == None) - return None; - - // Comparamos la top-level window de la ventana pasada con las de las - // posibles fake-top-level windows (realmente no son top-level, pero son las - // ventanas que guardan los atributos y de más), devolviendo la ventana que - // contiene el título, la clase, etc - Atom atomRet; - int size; - unsigned long numItems, bytesAfterReturn; - unsigned char* propRet; - long offset = 0; - long offsetSize = 100; - - Window ret = None; - - int status; - Atom atomList = XInternAtom(QX11Info::display(), - "_NET_CLIENT_LIST_STACKING", false); - do { - status = XGetWindowProperty(QX11Info::display(), - QX11Info::appRootWindow(), atomList, - offset, offsetSize, false, XA_WINDOW, &atomRet, &size, - &numItems, &bytesAfterReturn, &propRet); - - if(status == Success) { - - Window* aux = (Window*)propRet; - unsigned int n=0; - while(ret == None && ngetTopLevelWindow(aux[n]) == topIn) - ret = aux[n]; - n++; - } - offset += offsetSize; - XFree(propRet); - } - } while(status == Success && bytesAfterReturn != 0); - - return ret; -} - -Window GestureHandler::getTopLevelWindow(Window window) const { - Window root, parent; - Window* children; - unsigned int numChildren; - - if(XQueryTree(QX11Info::display(), window, &root, &parent, &children, - &numChildren) != 0) { - if(children != NULL) - XFree(children); - - if(parent == root) - return window; - else - return this->getTopLevelWindow(parent); - - } else { - return None; - } -} - -QString GestureHandler::getAppClass(Window window) const { - XClassHint* classHint = XAllocClassHint(); - XGetClassHint(QX11Info::display(), window, classHint); - QString ret = classHint->res_class; - XFree(classHint->res_class); - XFree(classHint->res_name); - return ret; -} - - -// ************************************************************************** // -// ********** PRIVATE SLOTS ********** // -// ************************************************************************** // - -void GestureHandler::executeTap() { - this->timerTap->stop(); - - if(this->currentGesture != NULL) { - qDebug() << "\tGesture Start"; - this->currentGesture->start(); - - qDebug() << "\tGesture Update"; - this->currentGesture->update(); - - qDebug() << "\tGesture Finish"; - this->currentGesture->finish(); - - delete this->currentGesture; - this->currentGesture = NULL; - } -} - - -// ************************************************************************** // -// ********** PUBLIC SLOTS ********** // -// ************************************************************************** // - -void GestureHandler::executeGestureStart(GeisGestureType type, - GeisGestureId id, const QHash& attrs) { - - // Si no se está ejecutando ningún gesto creamos uno nuevo - if(this->currentGesture == NULL) { - this->currentGesture = this->createGesture(type, id, attrs, false); - if(this->currentGesture != NULL) { - // Ejecutamos el gesto - qDebug() << "\tGesture Start"; - this->currentGesture->start(); - } - - // Si el timer está en ejecución podemos hacer un tap&hold - } else if(this->timerTap->isActive()) { - this->timerTap->stop(); - - // El nuevo gesto debe ser un drag con igual número de dedos que el tap - // en ejecución para que se considere un tap&hold - if(type == GEIS_GESTURE_PRIMITIVE_DRAG - && attrs.contains(GEIS_GESTURE_ATTRIBUTE_TOUCHES) - && this->currentGesture->getAttrs().contains( - GEIS_GESTURE_ATTRIBUTE_TOUCHES) - && attrs.value(GEIS_GESTURE_ATTRIBUTE_TOUCHES) - == this->currentGesture->getAttrs().value( - GEIS_GESTURE_ATTRIBUTE_TOUCHES)) { - delete this->currentGesture; - this->currentGesture = this->createGesture(type, id, attrs, true); - - if(this->currentGesture != NULL) { - // Ejecutamos el gesto - qDebug() << "\tGesture Start"; - this->currentGesture->start(); - } - - // Si no es un tap&hold ejecutamos el tap con normalidad - } else { - this->executeTap(); - } - } -} - -void GestureHandler::executeGestureUpdate(GeisGestureType type, - GeisGestureId id,const QHash& attrs) { - // Si es un update del gesto en ejecución - if(this->currentGesture != NULL && this->currentGesture->getId() == id) { - qDebug() << "\tGesture Update"; - this->currentGesture->setAttrs(attrs); - this->currentGesture->update(); - - // Si no se está ejecutando ningún gesto es que es un TAP o un gesto no - // soportado - } else if(this->currentGesture == NULL) { - // Si es un TAP, esperamos un poco para que se pueda usar un tap&hold - this->currentGesture = this->createGesture(type, id, attrs, false); - if(this->currentGesture != NULL) { - this->timerTap->start(); - } - } -} - -void GestureHandler::executeGestureFinish(GeisGestureType /*type*/, - GeisGestureId /*id*/, const QHash& attrs) { - if(this->currentGesture != NULL) { - qDebug() << "\tGesture Finish"; - this->currentGesture->setAttrs(attrs); - this->currentGesture->finish(); - delete this->currentGesture; - this->currentGesture = NULL; - } -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.h.svn-base touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.h.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.h.svn-base 2011-04-07 00:14:50.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/GestureHandler.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ -/** - * @file /src/touchegg/gestures/handler/GestureHandler.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureHandler - * @author José Expósito - */ -#ifndef GESTUREHANDLER_H -#define GESTUREHANDLER_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/config/Config.h" -#include "src/touchegg/gestures/factory/GestureFactory.h" -#include "src/touchegg/actions/factory/ActionFactory.h" - -/** - * @~spanish - * Clase que recibe los gestos, los procesa y ejecuta la acción correspondiente. - * - * @~english - * Class that receives the gestures, processes it and execute the corresponding - * action. - */ -class GestureHandler : public QThread { - - Q_OBJECT - - private: - - /** - * @~spanish - * Gesto que se está ejecutando. - * - * @~english - * Gesture that is running. - */ - Gesture* currentGesture; - - /** - * @~spanish - * Timer que ejecuta los taps siempre que el gesto no resulte ser un - * tap&hold. - * - * @~english - * Timer that running the taps always that the gesture does not prove - * to be a tap&hold. - */ - QTimer* timerTap; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Factoría para crear los gestos. - * - * @~english - * Factory to create gestures. - */ - GestureFactory* gestureFact; - - /** - * @~spanish - * Factoría para crear las acciones. - * - * @~english - * Factory to create gestures. - */ - ActionFactory* actionFact; - - /** - * @~spanish - * Provee acceso a la configurración. - * - * @~english - * Provides access to configurración. - */ - Config* config; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Crea un gesto estandar con su acción. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * @param isTapAndHold Si es o no un gesto tap&hold. - * @return El gesto o NULL. - * - * @~english - * Create a estandar gesture with their action. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - * @param isTapAndHold If is or not a tap&hold gesture. - * @return The gesture or NULL. - */ - Gesture* createGesture(GeisGestureType type, GeisGestureId id, - const QHash& attrs, bool isTapAndHold) const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve la ventana sobre la que se produce el gesto. - * @param window Ventana que nos pasa GEIS. - * @return Dicha ventana. - * - * @~english - * Returns window over the gestures is make. - * @param window The window that GEIS returns. - * @return This window. - */ - Window getGestureWindow(Window window) const; - - /** - * @~spanish - * Devuelve la ventana de más alto nivel de la ventana indicada. - * @param window La ventana. - * @return Dicha ventana - * - * @~english - * Returns the top level window of the specified window. - * @param window The window. - * @return This window. - */ - Window getTopLevelWindow(Window window) const; - - /** - * @~spanish - * Devuelve la clase de la ventana especificada, por ejemplo, para - * cualquier ventana de XTerm la clase será "XTerm". - * @param window Dicha ventana. - * @return La clase. - * - * @~english - * Returns the class of a window, for example, "XTerm" is the class of - * all instances of XTerm. - * @param window This window. - * @return The class. - */ - QString getAppClass(Window window) const; - - private slots: - - /** - * @~spanish - * Ejecuta los taps que no han resultado ser un tap&hold. - * - * @~english - * Run the taps that have not proven to be a tap&hold. - */ - void executeTap(); - - public: - - /** - * @~spanish - * Constructor. - * - * @~english - * Constructor. - */ - GestureHandler(); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~GestureHandler(); - - public slots: - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureStart(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureUpdate(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Ejecuta el gesto indicado. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Runs the indicated gesture. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - void executeGestureFinish(GeisGestureType type, GeisGestureId id, - const QHash& attrs); - -}; - -#endif // GESTUREHANDLER_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/gestures.handler.pri.svn-base touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/gestures.handler.pri.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/handler/.svn/text-base/gestures.handler.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/handler/.svn/text-base/gestures.handler.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/gestures/handler/GestureHandler.h - -SOURCES += \ - src/touchegg/gestures/handler/GestureHandler.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/Gesture.cpp touchegg-1.0/src/touchegg/gestures/implementation/Gesture.cpp --- touchegg-0.3+repack/src/touchegg/gestures/implementation/Gesture.cpp 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/Gesture.cpp 2011-09-02 15:45:29.000000000 +0000 @@ -1,34 +1,44 @@ /** * @file /src/touchegg/gestures/implementations/Gesture.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class Gesture - * @author José Expósito */ #include "Gesture.h" - // ************************************************************************** // // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // -Gesture::Gesture(GestureTypeEnum::GestureType type, GeisGestureId id, - const QHash& attrs) { - this->type = type; - this->id = id; - this->attrs = attrs; +Gesture::Gesture(GestureTypeEnum::GestureType type, int numFingers, + GestureDirectionEnum::GestureDirection dir, int id, + const QHash& attrs) + : type(type), + numFingers(numFingers), + dir(dir), + id(id), + attrs(attrs) +{ + } -Gesture::~Gesture() { - if(this->action != NULL) - delete this->action; +Gesture::~Gesture() +{ + delete this->action; } @@ -36,17 +46,20 @@ // ********** PUBLIC METHODS ********** // // ************************************************************************** // -void Gesture::start() const { +void Gesture::start() const +{ if(this->action != NULL) this->action->executeStart(this->attrs); } -void Gesture::update() const { +void Gesture::update() const +{ if(this->action != NULL) this->action->executeUpdate(this->attrs); } -void Gesture::finish() const { +void Gesture::finish() const +{ if(this->action != NULL) this->action->executeFinish(this->attrs); } @@ -56,34 +69,64 @@ // ********** GET/SET/IS ********** // // ************************************************************************** // -GestureTypeEnum::GestureType Gesture::getType() const { +GestureTypeEnum::GestureType Gesture::getType() const +{ return this->type; } -GeisGestureId Gesture::getId() const { +int Gesture::getNumFingers() const +{ + return this->numFingers; +} + +GestureDirectionEnum::GestureDirection Gesture::getDirection() const +{ + return this->dir; +} + +int Gesture::getId() const +{ return this->id; } -const QHash& Gesture::getAttrs() const { +const QHash& Gesture::getAttrs() const +{ return this->attrs; } -const Action* Gesture::getAction() const { +const Action* Gesture::getAction() const +{ return this->action; } -void Gesture::setType(GestureTypeEnum::GestureType type) { +//------------------------------------------------------------------------------ + +void Gesture::setType(GestureTypeEnum::GestureType type) +{ this->type = type; } -void Gesture::setId(GeisGestureId id) { +void Gesture::setNumFingers(int numFingers) +{ + this->numFingers = numFingers; +} + +void Gesture::setDirection(GestureDirectionEnum::GestureDirection dir) +{ + this->dir = dir; +} + +void Gesture::setId(int id) +{ this->id = id; } -void Gesture::setAttrs(const QHash& attrs) { +void Gesture::setAttrs(const QHash& attrs) +{ this->attrs = attrs; } -void Gesture::setAction(Action* action) { +void Gesture::setAction(Action* action) +{ this->action = action; } diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/Gesture.h touchegg-1.0/src/touchegg/gestures/implementation/Gesture.h --- touchegg-0.3+repack/src/touchegg/gestures/implementation/Gesture.h 2011-04-06 22:58:26.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/Gesture.h 2011-09-02 15:44:53.000000000 +0000 @@ -1,25 +1,31 @@ /** * @file /src/touchegg/gestures/implementations/Gesture.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class Gesture - * @author José Expósito */ #ifndef GESTURE_H #define GESTURE_H #include "src/touchegg/util/Include.h" #include "src/touchegg/gestures/types/GestureTypeEnum.h" +#include "src/touchegg/gestures/types/GestureDirectionEnum.h" #include "src/touchegg/actions/implementation/Action.h" - /** * @~spanish * Clase de la que deben heredar todos los gestos. @@ -27,200 +33,270 @@ * @~english * Class that should inherit all the gestures. */ -class Gesture { +class Gesture +{ + +private: - private: + /** + * @~spanish + * Tipo del gesto. + * + * @~english + * Gesture type. + */ + GestureTypeEnum::GestureType type; + + /** + * @~spanish + * Número de dedos usados por el gesto. + * + * @~english + * Number of fingers used by the gesture. + */ + int numFingers; + + /** + * @~spanish + * Dirección del gesto. + * + * @~english + * Direction of the gesture. + */ + GestureDirectionEnum::GestureDirection dir; + + /** + * @~spanish + * ID del gesto. + * + * @~english + * Gesture ID. + */ + int id; + + /** + * @~spanish + * Atributos del gestos, siendo la clave el nombre del atributo (por + * ejemplo "focus x", "touches"...) y el valor el valor del propio + * atributo. + * + * @~english + * Gesture attributes, where the key is the name of the attribute (ie + * "focus x", "touches") and the value the value of the attribute. + */ + QHash attrs; + + /** + * @~spanish + * Acción asociada al gesto. + * + * @~english + * Action associated to the gesture. + */ + Action* action; + +public: + + /** + * @~spanish + * Crea un gesto con las propiedades indicadas. + * @param type Tipo del gesto. + * @param numFingers Número de dedos usados por el gesto. + * @param dir Dirección del gesto. + * @param id ID del gesto. + * @param attrs Atributos del gestos, siendo la clave el nombre del + * atributo (por ejemplo "focus x", "touches"...) y el valor el + * valor del propio atributo. + * + * @~english + * Creates a gesture with the specified properties. + * @param type Gesture type. + * @param gestureType The gesture that is made. + * @param numFingers Number of fingers used by the gesture. + * @param dir Direction of the gesture. + * @param id Gesture ID. + * @param attrs Gesture attributes, where the key is the name of the + * attribute (ie "focus x", "touches") and the value the value of + * the attribute. + */ + Gesture(GestureTypeEnum::GestureType type, int numFingers, + GestureDirectionEnum::GestureDirection dir, int id, + const QHash& attrs); + + /** + * @~spanish + * Destructor. + * + * @~english + * Destructor. + */ + ~Gesture(); + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Se llama cuando el gesto se inicia. + * + * @~english + * Is called when the gesture is started. + */ + void start() const; + + /** + * @~spanish + * Se llama cuando el gesto se actualiza. + * + * @~english + * Is called when the gesture is updated. + */ + void update() const; + + /** + * @~spanish + * Se llama cuando el gesto se finaliza. + * + * @~english + * Is called when the gesture is finished. + */ + void finish() const; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve el tipo del gesto. + * @return El tipo. + * + * @~english + * Returns the gesture type. + * @return The type. + */ + GestureTypeEnum::GestureType getType() const; + + /** + * @~spanish + * Devuelve el número de dedos usados por el gesto. + * @return El número de dedos. + * + * @~english + * Returns the number of fingers used by the gesture. + * @return The number of fingers. + */ + int getNumFingers() const; + + /** + * @~spanish + * Devuelve la dirección del gesto. + * @return La dirección. + * + * @~english + * Returns the direction of the gesture. + * @return The direction. + */ + GestureDirectionEnum::GestureDirection getDirection() const; + + /** + * @~spanish + * Devuelve el ID del gesto. + * @return El ID. + * + * @~english + * Returns the gesture ID. + * @return The ID. + */ + int getId() const; + + /** + * @~spanish + * Devuelve los atributos del gesto. + * @return Los atributos. + * + * @~english + * Returns the gesture attributes. + * @return The attributes. + */ + const QHash& getAttrs() const; + + /** + * @~spanish + * Devuelve la acción asociada al gesto. + * @return La acción. + * + * @~english + * Returns the gesture action. + * @return The action. + */ + const Action* getAction() const; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Establece el tipo del gesto. + * @param type El tipo. + * + * @~english + * Sets the gesture type. + * @param type The type. + */ + void setType(GestureTypeEnum::GestureType type); + + /** + * @~spanish + * Establece el número de dedos usados por el gesto. + * @return El número de dedos. + * + * @~english + * Sets the number of fingers used by the gesture. + * @return The number of fingers. + */ + void setNumFingers(int numFingers); + + /** + * @~spanish + * Establece la dirección del gesto. + * @return La dirección. + * + * @~english + * Sets the direction of the gesture. + * @return The direction. + */ + void setDirection(GestureDirectionEnum::GestureDirection dir); + + /** + * @~spanish + * Establece el ID del gesto. + * @param id El ID. + * + * @~english + * Sets the gesture ID. + * @param id The ID. + */ + void setId(int id); + + /** + * @~spanish + * Establece los atributos del gesto. + * @param attrs Los atributos. + * + * @~english + * Sets the gesture attributes. + * @param attrs The attributes. + */ + void setAttrs(const QHash& attrs); + + /** + * @~spanish + * Establece la acción a ejecutar por el gesto. + * @param action La acción. + * + * @~english + * Sets the action to be executed by gesture. + * @param action The action. + */ + void setAction(Action* action); - /** - * @~spanish - * Tipo del gesto. - * - * @~english - * Gesture type. - */ - GestureTypeEnum::GestureType type; - - /** - * @~spanish - * ID del gesto. - * - * @~english - * Gesture ID. - */ - GeisGestureId id; - - /** - * @~spanish - * Atributos del gestos, siendo la clave el nombre del atributo (por - * ejemplo "focus x", "touches"...) y el valor el valor del propio - * atributo. - * - * @~english - * Gesture attributes, where the key is the name of the attribute (ie - * "focus x", "touches") and the value the value of the attribute. - */ - QHash attrs; - - /** - * @~spanish - * Acción asociada al gesto. - * - * @~english - * Action associated to the gesture. - */ - Action* action; - - public: - - /** - * @~spanish - * Crea un gesto con las propiedades indicadas. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Creates a gesture with the specified properties. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - Gesture(GestureTypeEnum::GestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~Gesture(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Se llama cuando el gesto se inicia. - * - * @~english - * Is called when the gesture is started. - */ - void start() const; - - /** - * @~spanish - * Se llama cuando el gesto se actualiza. - * - * @~english - * Is called when the gesture is updated. - */ - void update() const; - - /** - * @~spanish - * Se llama cuando el gesto se finaliza. - * - * @~english - * Is called when the gesture is finished. - */ - void finish() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tipo del gesto. - * @return El tipo. - * - * @~english - * Returns the gesture type. - * @return The type. - */ - GestureTypeEnum::GestureType getType() const; - - /** - * @~spanish - * Devuelve el ID del gesto. - * @return El ID. - * - * @~english - * Returns the gesture ID. - * @return The ID. - */ - GeisGestureId getId() const; - - /** - * @~spanish - * Devuelve los atributos del gesto. - * @return Los atributos. - * - * @~english - * Returns the gesture attributes. - * @return The attributes. - */ - const QHash& getAttrs() const; - - /** - * @~spanish - * Devuelve la acción asociada al gesto. - * @return La acción. - * - * @~english - * Returns the gesture action. - * @return The action. - */ - const Action* getAction() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Establece el tipo del gesto. - * @param type El tipo. - * - * @~english - * Sets the gesture type. - * @param type The type. - */ - void setType(GestureTypeEnum::GestureType type); - - /** - * @~spanish - * Establece el ID del gesto. - * @param id El ID. - * - * @~english - * Sets the gesture ID. - * @param id The ID. - */ - void setId(GeisGestureId id); - - /** - * @~spanish - * Establece los atributos del gesto. - * @param attrs Los atributos. - * - * @~english - * Sets the gesture attributes. - * @param attrs The attributes. - */ - void setAttrs(const QHash& attrs); - - /** - * @~spanish - * Establece la acción a ejecutar por el gesto. - * @param action La acción. - * - * @~english - * Sets the action to be executed by gesture. - * @param action The action. - */ - void setAction(Action* action); }; #endif // GESTURE_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/implementation/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/all-wcprops 2011-04-07 00:14:52.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 62 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/implementation -END -Gesture.cpp -K 25 -svn:wc:ra_dav:version-url -V 74 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/implementation/Gesture.cpp -END -Gesture.h -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/103/touchegg/src/touchegg/gestures/implementation/Gesture.h -END -gestures.implementation.pri -K 25 -svn:wc:ra_dav:version-url -V 90 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/implementation/gestures.implementation.pri -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/entries touchegg-1.0/src/touchegg/gestures/implementation/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/entries 2011-04-07 00:14:52.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures/implementation -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -Gesture.cpp -file - - - - -2011-03-23T00:27:30.336916Z -2735b32846f2e57a5a2e8ba75d8f6860 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2402 - -Gesture.h -file -103 - - - -2011-04-06T22:58:26.211544Z -6df484361c5d5f006e43ea6816994913 -2011-04-07T00:14:43.841574Z -103 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -5837 - -gestures.implementation.pri -file - - - - -2011-03-23T00:27:30.336916Z -d3a7052a44418e64567f1d86c0d5baad -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -132 - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/Gesture.cpp.svn-base touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/Gesture.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/Gesture.cpp.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/Gesture.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -/** - * @file /src/touchegg/gestures/implementations/Gesture.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Gesture - * @author José Expósito - */ -#include "Gesture.h" - - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -Gesture::Gesture(GestureTypeEnum::GestureType type, GeisGestureId id, - const QHash& attrs) { - this->type = type; - this->id = id; - this->attrs = attrs; -} - -Gesture::~Gesture() { - if(this->action != NULL) - delete this->action; -} - - -// ************************************************************************** // -// ********** PUBLIC METHODS ********** // -// ************************************************************************** // - -void Gesture::start() const { - if(this->action != NULL) - this->action->executeStart(this->attrs); -} - -void Gesture::update() const { - if(this->action != NULL) - this->action->executeUpdate(this->attrs); -} - -void Gesture::finish() const { - if(this->action != NULL) - this->action->executeFinish(this->attrs); -} - - -// ************************************************************************** // -// ********** GET/SET/IS ********** // -// ************************************************************************** // - -GestureTypeEnum::GestureType Gesture::getType() const { - return this->type; -} - -GeisGestureId Gesture::getId() const { - return this->id; -} - -const QHash& Gesture::getAttrs() const { - return this->attrs; -} - -const Action* Gesture::getAction() const { - return this->action; -} - -void Gesture::setType(GestureTypeEnum::GestureType type) { - this->type = type; -} - -void Gesture::setId(GeisGestureId id) { - this->id = id; -} - -void Gesture::setAttrs(const QHash& attrs) { - this->attrs = attrs; -} - -void Gesture::setAction(Action* action) { - this->action = action; -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/Gesture.h.svn-base touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/Gesture.h.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/Gesture.h.svn-base 2011-04-07 00:14:47.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/Gesture.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,226 +0,0 @@ -/** - * @file /src/touchegg/gestures/implementations/Gesture.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Gesture - * @author José Expósito - */ -#ifndef GESTURE_H -#define GESTURE_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/gestures/types/GestureTypeEnum.h" -#include "src/touchegg/actions/implementation/Action.h" - - -/** - * @~spanish - * Clase de la que deben heredar todos los gestos. - * - * @~english - * Class that should inherit all the gestures. - */ -class Gesture { - - private: - - /** - * @~spanish - * Tipo del gesto. - * - * @~english - * Gesture type. - */ - GestureTypeEnum::GestureType type; - - /** - * @~spanish - * ID del gesto. - * - * @~english - * Gesture ID. - */ - GeisGestureId id; - - /** - * @~spanish - * Atributos del gestos, siendo la clave el nombre del atributo (por - * ejemplo "focus x", "touches"...) y el valor el valor del propio - * atributo. - * - * @~english - * Gesture attributes, where the key is the name of the attribute (ie - * "focus x", "touches") and the value the value of the attribute. - */ - QHash attrs; - - /** - * @~spanish - * Acción asociada al gesto. - * - * @~english - * Action associated to the gesture. - */ - Action* action; - - public: - - /** - * @~spanish - * Crea un gesto con las propiedades indicadas. - * @param type Tipo del gesto. - * @param id ID del gesto. - * @param attrs Atributos del gestos, siendo la clave el nombre del - * atributo (por ejemplo "focus x", "touches"...) y el valor el - * valor del propio atributo. - * - * @~english - * Creates a gesture with the specified properties. - * @param type Gesture type. - * @param id Gesture ID. - * @param attrs Gesture attributes, where the key is the name of the - * attribute (ie "focus x", "touches") and the value the value of - * the attribute. - */ - Gesture(GestureTypeEnum::GestureType type, GeisGestureId id, - const QHash& attrs); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~Gesture(); - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Se llama cuando el gesto se inicia. - * - * @~english - * Is called when the gesture is started. - */ - void start() const; - - /** - * @~spanish - * Se llama cuando el gesto se actualiza. - * - * @~english - * Is called when the gesture is updated. - */ - void update() const; - - /** - * @~spanish - * Se llama cuando el gesto se finaliza. - * - * @~english - * Is called when the gesture is finished. - */ - void finish() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Devuelve el tipo del gesto. - * @return El tipo. - * - * @~english - * Returns the gesture type. - * @return The type. - */ - GestureTypeEnum::GestureType getType() const; - - /** - * @~spanish - * Devuelve el ID del gesto. - * @return El ID. - * - * @~english - * Returns the gesture ID. - * @return The ID. - */ - GeisGestureId getId() const; - - /** - * @~spanish - * Devuelve los atributos del gesto. - * @return Los atributos. - * - * @~english - * Returns the gesture attributes. - * @return The attributes. - */ - const QHash& getAttrs() const; - - /** - * @~spanish - * Devuelve la acción asociada al gesto. - * @return La acción. - * - * @~english - * Returns the gesture action. - * @return The action. - */ - const Action* getAction() const; - - //---------------------------------------------------------------------- - - /** - * @~spanish - * Establece el tipo del gesto. - * @param type El tipo. - * - * @~english - * Sets the gesture type. - * @param type The type. - */ - void setType(GestureTypeEnum::GestureType type); - - /** - * @~spanish - * Establece el ID del gesto. - * @param id El ID. - * - * @~english - * Sets the gesture ID. - * @param id The ID. - */ - void setId(GeisGestureId id); - - /** - * @~spanish - * Establece los atributos del gesto. - * @param attrs Los atributos. - * - * @~english - * Sets the gesture attributes. - * @param attrs The attributes. - */ - void setAttrs(const QHash& attrs); - - /** - * @~spanish - * Establece la acción a ejecutar por el gesto. - * @param action La acción. - * - * @~english - * Sets the action to be executed by gesture. - * @param action The action. - */ - void setAction(Action* action); -}; - -#endif // GESTURE_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/gestures.implementation.pri.svn-base touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/gestures.implementation.pri.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/implementation/.svn/text-base/gestures.implementation.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/implementation/.svn/text-base/gestures.implementation.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - -HEADERS += \ - src/touchegg/gestures/implementation/Gesture.h -SOURCES += \ - src/touchegg/gestures/implementation/Gesture.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/.svn/all-wcprops 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/.svn/entries touchegg-1.0/src/touchegg/gestures/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/.svn/entries 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -types -dir - -implementation -dir - -collector -dir - -factory -dir - -handler -dir - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/GestureDirectionEnum.cpp touchegg-1.0/src/touchegg/gestures/types/GestureDirectionEnum.cpp --- touchegg-0.3+repack/src/touchegg/gestures/types/GestureDirectionEnum.cpp 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/GestureDirectionEnum.cpp 2011-07-11 06:35:44.000000000 +0000 @@ -0,0 +1,45 @@ +/** + * @file src/touchegg/gestures/types/GestureDirectionEnum.cpp + * + * This file is part of Touchégg. + * + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 + * @class GestureDirectionEnum + */ +#include "GestureDirectionEnum.h" + +// ************************************************************************** // +// ********** STATIC METHODS AND VARIABLES ********** // +// ************************************************************************** // + +QString GestureDirectionEnum::getValue(GestureDirection gdEnum) +{ + GestureDirectionEnum GestureDirectionEnum; + int index = GestureDirectionEnum.metaObject()->indexOfEnumerator( + "GestureDirection"); + QMetaEnum metaEnum = GestureDirectionEnum.metaObject()->enumerator(index); + return metaEnum.valueToKey(gdEnum); +} + +GestureDirectionEnum::GestureDirection GestureDirectionEnum::getEnum( + const QString& gdString) +{ + GestureDirectionEnum GestureDirectionEnum; + int index = GestureDirectionEnum.metaObject()->indexOfEnumerator( + "GestureDirection"); + QMetaEnum metaEnum = GestureDirectionEnum.metaObject()->enumerator(index); + return (GestureDirectionEnum::GestureDirection)metaEnum.keyToValue( + gdString.toStdString().c_str()); +} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/GestureDirectionEnum.h touchegg-1.0/src/touchegg/gestures/types/GestureDirectionEnum.h --- touchegg-0.3+repack/src/touchegg/gestures/types/GestureDirectionEnum.h 1970-01-01 00:00:00.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/GestureDirectionEnum.h 2011-07-11 07:06:49.000000000 +0000 @@ -0,0 +1,83 @@ +/** + * @file src/touchegg/gestures/types/GestureDirectionEnum.h + * + * This file is part of Touchégg. + * + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 + * @class GestureDirectionEnum + */ +#ifndef GESTUREDIRECTIONENUM_H +#define GESTUREDIRECTIONENUM_H + +#include "src/touchegg/util/Include.h" + +/** + * @~spanish + * Contiene un tipo enumerado con las posibles direcciones de los gestos. + * + * @~english + * Contains an enumerated type with availables directions of gestures. + */ +class GestureDirectionEnum : public QObject +{ + + Q_OBJECT + Q_ENUMS(GestureDirection); + +public: + + /** + * @~spanish + * Tipo enumerado con las direcciones disponibles. + * + * @~english + * Enumerated type with supported directions. + */ + enum GestureDirection { + NO_DIRECTION, + ALL, + UP, + DOWN, + LEFT, + RIGHT, + IN, + OUT + }; + + /** + * @~spanish + * Convierte el tipo enumedrado a QString. + * @return El QString + * + * @~english + * Converts the enum to QString. + * @return The QString. + */ + static QString getValue(GestureDirection gtEnum); + + /** + * @~spanish + * Convierte el QString indicado en su equivalente tipo enumedrado. + * @return El tipo enumerado + * + * @~english + * Converts the indicated QString to the equivalent enum type. + * @return The enum type. + */ + static GestureDirection getEnum(const QString& gtString); + +}; + +#endif // GESTUREDIRECTIONENUM_H diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/gestures.types.pri touchegg-1.0/src/touchegg/gestures/types/gestures.types.pri --- touchegg-0.3+repack/src/touchegg/gestures/types/gestures.types.pri 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/gestures.types.pri 2011-05-25 22:30:58.000000000 +0000 @@ -1,7 +1,9 @@ HEADERS += \ - src/touchegg/gestures/types/GestureTypeEnum.h + src/touchegg/gestures/types/GestureTypeEnum.h \ + src/touchegg/gestures/types/GestureDirectionEnum.h SOURCES += \ - src/touchegg/gestures/types/GestureTypeEnum.cpp + src/touchegg/gestures/types/GestureTypeEnum.cpp \ + src/touchegg/gestures/types/GestureDirectionEnum.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/GestureTypeEnum.cpp touchegg-1.0/src/touchegg/gestures/types/GestureTypeEnum.cpp --- touchegg-0.3+repack/src/touchegg/gestures/types/GestureTypeEnum.cpp 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/GestureTypeEnum.cpp 2011-09-02 06:15:12.000000000 +0000 @@ -1,32 +1,39 @@ /** * @file src/touchegg/gestures/types/GestureTypeEnum.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureTypeEnum - * @author José Expósito */ #include "GestureTypeEnum.h" - // ************************************************************************** // // ********** STATIC METHODS AND VARIABLES ********** // // ************************************************************************** // -QString GestureTypeEnum::getValue(GestureType gtEnum) { +QString GestureTypeEnum::getValue(GestureType gtEnum) +{ GestureTypeEnum gestureTypeEnum; int index = gestureTypeEnum.metaObject()->indexOfEnumerator("GestureType"); QMetaEnum metaEnum = gestureTypeEnum.metaObject()->enumerator(index); return metaEnum.valueToKey(gtEnum); } -GestureTypeEnum::GestureType GestureTypeEnum::getEnum(const QString& gtString) { +GestureTypeEnum::GestureType GestureTypeEnum::getEnum(const QString& gtString) +{ GestureTypeEnum gestureTypeEnum; int index = gestureTypeEnum.metaObject()->indexOfEnumerator("GestureType"); QMetaEnum metaEnum = gestureTypeEnum.metaObject()->enumerator(index); @@ -34,70 +41,27 @@ gtString.toStdString().c_str()); } -QStringList GestureTypeEnum::getGeisEquivalent(GestureType gt) { +QStringList GestureTypeEnum::getGeisEquivalent(GestureType gt) +{ switch(gt) { - case TWO_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP2); - case THREE_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP3); - case FOUR_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP4); - case FIVE_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP5); - - case TWO_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH2); - case THREE_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH3); - case FOUR_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH4); - case FIVE_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH5); - - case TWO_FINGERS_DRAG_UP: - case TWO_FINGERS_DRAG_DOWN: - case TWO_FINGERS_DRAG_LEFT: - case TWO_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG2); - - case THREE_FINGERS_DRAG_UP: - case THREE_FINGERS_DRAG_DOWN: - case THREE_FINGERS_DRAG_LEFT: - case THREE_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG3); - - case FOUR_FINGERS_DRAG_UP: - case FOUR_FINGERS_DRAG_DOWN: - case FOUR_FINGERS_DRAG_LEFT: - case FOUR_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG4); - - case FIVE_FINGERS_DRAG_UP: - case FIVE_FINGERS_DRAG_DOWN: - case FIVE_FINGERS_DRAG_LEFT: - case FIVE_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG5); - - case TWO_FINGERS_TAP_AND_HOLD: { - QStringList tah2(GEIS_GESTURE_TYPE_TAP2); - tah2.append(GEIS_GESTURE_TYPE_DRAG2); - return tah2; - } - case THREE_FINGERS_TAP_AND_HOLD: { - QStringList tah3(GEIS_GESTURE_TYPE_TAP3); - tah3.append(GEIS_GESTURE_TYPE_DRAG3); - return tah3; - } - case FOUR_FINGERS_TAP_AND_HOLD: { - QStringList tah4(GEIS_GESTURE_TYPE_TAP4); - tah4.append(GEIS_GESTURE_TYPE_DRAG4); - return tah4; - } - case FIVE_FINGERS_TAP_AND_HOLD: { - QStringList tah5(GEIS_GESTURE_TYPE_TAP5); - tah5.append(GEIS_GESTURE_TYPE_DRAG5); - return tah5; - } + + case TAP: + return QStringList(GEIS_GESTURE_TAP); + + case DRAG: + return QStringList(GEIS_GESTURE_DRAG); + + case PINCH: + return QStringList(GEIS_GESTURE_PINCH); + + case ROTATE: + return QStringList(GEIS_GESTURE_ROTATE); + + case TAP_AND_HOLD: + return QStringList() << GEIS_GESTURE_TAP << GEIS_GESTURE_DRAG; + + case DOUBLE_TAP: + return QStringList(GEIS_GESTURE_TAP); default: return QStringList(); diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/GestureTypeEnum.h touchegg-1.0/src/touchegg/gestures/types/GestureTypeEnum.h --- touchegg-0.3+repack/src/touchegg/gestures/types/GestureTypeEnum.h 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/GestureTypeEnum.h 2011-09-02 06:16:15.000000000 +0000 @@ -1,23 +1,28 @@ /** * @file src/touchegg/gestures/types/GestureTypeEnum.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class GestureTypeEnum - * @author José Expósito */ #ifndef GESTURETYPEENUM_H #define GESTURETYPEENUM_H #include "src/touchegg/util/Include.h" - /** * @~spanish * Contiene un tipo enumerado con los gestos soportados. @@ -25,102 +30,73 @@ * @~english * Contains a enumeradted type with supported gestures. */ -class GestureTypeEnum : public QObject { +class GestureTypeEnum : public QObject +{ Q_OBJECT Q_ENUMS(GestureType); - public: +public: - /** - * @~spanish - * Tipo enumerado con los gestos soportados. - * - * @~english - * Enumerated type with supported gestures. - */ - enum GestureType { - // TAP - TWO_FINGERS_TAP, - THREE_FINGERS_TAP, - FOUR_FINGERS_TAP, - FIVE_FINGERS_TAP, - - // PINCH - TWO_FINGERS_PINCH, - THREE_FINGERS_PINCH, - FOUR_FINGERS_PINCH, - FIVE_FINGERS_PINCH, - - // DRAG - TWO_FINGERS_DRAG_UP, - TWO_FINGERS_DRAG_DOWN, - TWO_FINGERS_DRAG_LEFT, - TWO_FINGERS_DRAG_RIGHT, - - THREE_FINGERS_DRAG_UP, - THREE_FINGERS_DRAG_DOWN, - THREE_FINGERS_DRAG_LEFT, - THREE_FINGERS_DRAG_RIGHT, - - FOUR_FINGERS_DRAG_UP, - FOUR_FINGERS_DRAG_DOWN, - FOUR_FINGERS_DRAG_LEFT, - FOUR_FINGERS_DRAG_RIGHT, - - FIVE_FINGERS_DRAG_UP, - FIVE_FINGERS_DRAG_DOWN, - FIVE_FINGERS_DRAG_LEFT, - FIVE_FINGERS_DRAG_RIGHT, - - // TAP & HOLD - TWO_FINGERS_TAP_AND_HOLD, - THREE_FINGERS_TAP_AND_HOLD, - FOUR_FINGERS_TAP_AND_HOLD, - FIVE_FINGERS_TAP_AND_HOLD - }; - - /** - * @~spanish - * Convierte el tipo enumedrado a QString. - * @return El QString - * - * @~english - * Converts the enum to QString. - * @return The QString. - */ - static QString getValue(GestureType gtEnum); - - /** - * @~spanish - * Convierte el QString indicado en su equivalente tipo enumedrado. - * @return El tipo enumerado - * - * @~english - * Converts the indicated QString to the equivalent enum type. - * @return The enum type. - */ - static GestureType getEnum(const QString& gtString); - - /** - * @~spanish - * Devuelve una lista con los gestos de uTouch-GEIS equivalentes al - * gesto indicado, si no tiene devuelve una lista vacía. - * Por ejemplo, el equivalente de TWO_FINGERS_TAP_AND_HOLD es - * {GEIS_GESTURE_TYPE_TAP2, GEIS_GESTURE_TYPE_DRAG2}. - * @param gt El gesto. - * @return Su equivalente. - * - * @~english - * Returns a list with the equivalents uTouch-GEIS gestures to the - * indicated gesture, if it doesn't have equivalent, returns an empty - * list. - * For example, the equivalent of TWO_FINGERS_TAP_AND_HOLD is - * {GEIS_GESTURE_TYPE_TAP2, GEIS_GESTURE_TYPE_DRAG2}. - * @param gt The gesture. - * @return The equivalent. - */ - static QStringList getGeisEquivalent(GestureType gt); + /** + * @~spanish + * Tipo enumerado con los gestos soportados. + * + * @~english + * Enumerated type with supported gestures. + */ + enum GestureType { + TAP, + DRAG, + PINCH, + ROTATE, + TAP_AND_HOLD, + DOUBLE_TAP + }; + + /** + * @~spanish + * Convierte el tipo enumedrado a QString. + * @return El QString + * + * @~english + * Converts the enum to QString. + * @return The QString. + */ + static QString getValue(GestureType gtEnum); + + /** + * @~spanish + * Convierte el QString indicado en su equivalente tipo enumedrado. + * @return El tipo enumerado + * + * @~english + * Converts the indicated QString to the equivalent enum type. + * @return The enum type. + */ + static GestureType getEnum(const QString& gtString); + + /** + * @~spanish + * Devuelve una lista con los gestos de uTouch-GEIS equivalentes al + * gesto indicado, si no tiene un equivalente, devuelve una lista vacía. + * Por ejemplo, el equivalente de un gesto tap_and_hold es + * {GEIS_GESTURE_TAP, GEIS_GESTURE_DRAG}. + * @param gt El gesto. + * @param numFingers Número de dedos usados en el gesto. + * @return Su equivalente. + * + * @~english + * Returns a list with the equivalents uTouch-GEIS gestures to the + * indicated gesture, if it doesn't have equivalent, returns an empty + * list. + * For example, the equivalent of a tap_and_hold gesture is + * {GEIS_GESTURE_TAP, GEIS_GESTURE_DRAG}. + * @param gt The gesture. + * @param numFingers Number of fingers used in the gesture. + * @return The equivalent. + */ + static QStringList getGeisEquivalent(GestureType gt); }; diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/.svn/all-wcprops touchegg-1.0/src/touchegg/gestures/types/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/gestures/types/.svn/all-wcprops 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/types -END -GestureTypeEnum.cpp -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/types/GestureTypeEnum.cpp -END -GestureTypeEnum.h -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/types/GestureTypeEnum.h -END -gestures.types.pri -K 25 -svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/97/touchegg/src/touchegg/gestures/types/gestures.types.pri -END diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/.svn/entries touchegg-1.0/src/touchegg/gestures/types/.svn/entries --- touchegg-0.3+repack/src/touchegg/gestures/types/.svn/entries 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/gestures/types -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -GestureTypeEnum.cpp -file - - - - -2011-03-23T00:27:30.320916Z -334c426fc53b03e00c4184bdb233bed2 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3535 - -GestureTypeEnum.h -file - - - - -2011-03-23T00:27:30.324916Z -c99be422eba11ae7635bd0296ea93939 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -3572 - -gestures.types.pri -file - - - - -2011-03-23T00:27:30.324916Z -4293f2b69ae28994064d89811e4df72c -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -132 - diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/gestures.types.pri.svn-base touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/gestures.types.pri.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/gestures.types.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/gestures.types.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - -HEADERS += \ - src/touchegg/gestures/types/GestureTypeEnum.h - -SOURCES += \ - src/touchegg/gestures/types/GestureTypeEnum.cpp diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.cpp.svn-base touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.cpp.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/** - * @file src/touchegg/gestures/types/GestureTypeEnum.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureTypeEnum - * @author José Expósito - */ -#include "GestureTypeEnum.h" - - -// ************************************************************************** // -// ********** STATIC METHODS AND VARIABLES ********** // -// ************************************************************************** // - -QString GestureTypeEnum::getValue(GestureType gtEnum) { - GestureTypeEnum gestureTypeEnum; - int index = gestureTypeEnum.metaObject()->indexOfEnumerator("GestureType"); - QMetaEnum metaEnum = gestureTypeEnum.metaObject()->enumerator(index); - return metaEnum.valueToKey(gtEnum); -} - -GestureTypeEnum::GestureType GestureTypeEnum::getEnum(const QString& gtString) { - GestureTypeEnum gestureTypeEnum; - int index = gestureTypeEnum.metaObject()->indexOfEnumerator("GestureType"); - QMetaEnum metaEnum = gestureTypeEnum.metaObject()->enumerator(index); - return (GestureTypeEnum::GestureType)metaEnum.keyToValue( - gtString.toStdString().c_str()); -} - -QStringList GestureTypeEnum::getGeisEquivalent(GestureType gt) { - switch(gt) { - case TWO_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP2); - case THREE_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP3); - case FOUR_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP4); - case FIVE_FINGERS_TAP: - return QStringList(GEIS_GESTURE_TYPE_TAP5); - - case TWO_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH2); - case THREE_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH3); - case FOUR_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH4); - case FIVE_FINGERS_PINCH: - return QStringList(GEIS_GESTURE_TYPE_PINCH5); - - case TWO_FINGERS_DRAG_UP: - case TWO_FINGERS_DRAG_DOWN: - case TWO_FINGERS_DRAG_LEFT: - case TWO_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG2); - - case THREE_FINGERS_DRAG_UP: - case THREE_FINGERS_DRAG_DOWN: - case THREE_FINGERS_DRAG_LEFT: - case THREE_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG3); - - case FOUR_FINGERS_DRAG_UP: - case FOUR_FINGERS_DRAG_DOWN: - case FOUR_FINGERS_DRAG_LEFT: - case FOUR_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG4); - - case FIVE_FINGERS_DRAG_UP: - case FIVE_FINGERS_DRAG_DOWN: - case FIVE_FINGERS_DRAG_LEFT: - case FIVE_FINGERS_DRAG_RIGHT: - return QStringList(GEIS_GESTURE_TYPE_DRAG5); - - case TWO_FINGERS_TAP_AND_HOLD: { - QStringList tah2(GEIS_GESTURE_TYPE_TAP2); - tah2.append(GEIS_GESTURE_TYPE_DRAG2); - return tah2; - } - case THREE_FINGERS_TAP_AND_HOLD: { - QStringList tah3(GEIS_GESTURE_TYPE_TAP3); - tah3.append(GEIS_GESTURE_TYPE_DRAG3); - return tah3; - } - case FOUR_FINGERS_TAP_AND_HOLD: { - QStringList tah4(GEIS_GESTURE_TYPE_TAP4); - tah4.append(GEIS_GESTURE_TYPE_DRAG4); - return tah4; - } - case FIVE_FINGERS_TAP_AND_HOLD: { - QStringList tah5(GEIS_GESTURE_TYPE_TAP5); - tah5.append(GEIS_GESTURE_TYPE_DRAG5); - return tah5; - } - - default: - return QStringList(); - } -} diff -Nru touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.h.svn-base touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.h.svn-base --- touchegg-0.3+repack/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.h.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/gestures/types/.svn/text-base/GestureTypeEnum.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,127 +0,0 @@ -/** - * @file src/touchegg/gestures/types/GestureTypeEnum.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class GestureTypeEnum - * @author José Expósito - */ -#ifndef GESTURETYPEENUM_H -#define GESTURETYPEENUM_H - -#include "src/touchegg/util/Include.h" - - -/** - * @~spanish - * Contiene un tipo enumerado con los gestos soportados. - * - * @~english - * Contains a enumeradted type with supported gestures. - */ -class GestureTypeEnum : public QObject { - - Q_OBJECT - Q_ENUMS(GestureType); - - public: - - /** - * @~spanish - * Tipo enumerado con los gestos soportados. - * - * @~english - * Enumerated type with supported gestures. - */ - enum GestureType { - // TAP - TWO_FINGERS_TAP, - THREE_FINGERS_TAP, - FOUR_FINGERS_TAP, - FIVE_FINGERS_TAP, - - // PINCH - TWO_FINGERS_PINCH, - THREE_FINGERS_PINCH, - FOUR_FINGERS_PINCH, - FIVE_FINGERS_PINCH, - - // DRAG - TWO_FINGERS_DRAG_UP, - TWO_FINGERS_DRAG_DOWN, - TWO_FINGERS_DRAG_LEFT, - TWO_FINGERS_DRAG_RIGHT, - - THREE_FINGERS_DRAG_UP, - THREE_FINGERS_DRAG_DOWN, - THREE_FINGERS_DRAG_LEFT, - THREE_FINGERS_DRAG_RIGHT, - - FOUR_FINGERS_DRAG_UP, - FOUR_FINGERS_DRAG_DOWN, - FOUR_FINGERS_DRAG_LEFT, - FOUR_FINGERS_DRAG_RIGHT, - - FIVE_FINGERS_DRAG_UP, - FIVE_FINGERS_DRAG_DOWN, - FIVE_FINGERS_DRAG_LEFT, - FIVE_FINGERS_DRAG_RIGHT, - - // TAP & HOLD - TWO_FINGERS_TAP_AND_HOLD, - THREE_FINGERS_TAP_AND_HOLD, - FOUR_FINGERS_TAP_AND_HOLD, - FIVE_FINGERS_TAP_AND_HOLD - }; - - /** - * @~spanish - * Convierte el tipo enumedrado a QString. - * @return El QString - * - * @~english - * Converts the enum to QString. - * @return The QString. - */ - static QString getValue(GestureType gtEnum); - - /** - * @~spanish - * Convierte el QString indicado en su equivalente tipo enumedrado. - * @return El tipo enumerado - * - * @~english - * Converts the indicated QString to the equivalent enum type. - * @return The enum type. - */ - static GestureType getEnum(const QString& gtString); - - /** - * @~spanish - * Devuelve una lista con los gestos de uTouch-GEIS equivalentes al - * gesto indicado, si no tiene devuelve una lista vacía. - * Por ejemplo, el equivalente de TWO_FINGERS_TAP_AND_HOLD es - * {GEIS_GESTURE_TYPE_TAP2, GEIS_GESTURE_TYPE_DRAG2}. - * @param gt El gesto. - * @return Su equivalente. - * - * @~english - * Returns a list with the equivalents uTouch-GEIS gestures to the - * indicated gesture, if it doesn't have equivalent, returns an empty - * list. - * For example, the equivalent of TWO_FINGERS_TAP_AND_HOLD is - * {GEIS_GESTURE_TYPE_TAP2, GEIS_GESTURE_TYPE_DRAG2}. - * @param gt The gesture. - * @return The equivalent. - */ - static QStringList getGeisEquivalent(GestureType gt); - -}; - -#endif // GESTURETYPEENUM_H diff -Nru touchegg-0.3+repack/src/touchegg/Main.cpp touchegg-1.0/src/touchegg/Main.cpp --- touchegg-0.3+repack/src/touchegg/Main.cpp 2011-04-02 14:03:21.000000000 +0000 +++ touchegg-1.0/src/touchegg/Main.cpp 2011-09-03 18:54:48.000000000 +0000 @@ -1,15 +1,21 @@ /** * @file /src/touchegg/Main.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * - * @author José Expósito + * @author José Expósito (C) 2011 */ #include "src/touchegg/util/Include.h" #include "src/touchegg/Touchegg.h" @@ -25,8 +31,8 @@ * @param argc Number of arguments received by console. * @param argv Argument list. */ -int main(int argc, char** argv) { - QApplication app(argc, argv); - Touchegg touchegg; - return app.exec(); +int main(int argc, char** argv) +{ + Touchegg touchegg(argc, argv); + return touchegg.exec(); } diff -Nru touchegg-0.3+repack/src/touchegg/.svn/all-wcprops touchegg-1.0/src/touchegg/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/.svn/all-wcprops 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 38 -/svn/!svn/ver/97/touchegg/src/touchegg -END -Main.cpp -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/97/touchegg/src/touchegg/Main.cpp -END -Touchegg.cpp -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/109/touchegg/src/touchegg/Touchegg.cpp -END -Touchegg.h -K 25 -svn:wc:ra_dav:version-url -V 49 -/svn/!svn/ver/97/touchegg/src/touchegg/Touchegg.h -END -touchegg.pri -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/97/touchegg/src/touchegg/touchegg.pri -END diff -Nru touchegg-0.3+repack/src/touchegg/.svn/entries touchegg-1.0/src/touchegg/.svn/entries --- touchegg-0.3+repack/src/touchegg/.svn/entries 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -actions -dir - -gestures -dir - -config -dir - -Main.cpp -file - - - - -2011-03-23T00:27:30.468916Z -b564ffc6c652e78c9d8e5576d71313a4 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -847 - -Touchegg.cpp -file -109 - - - -2011-04-13T10:52:42.330756Z -cba52af554c6bb729d020db23d51c90a -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -2199 - -Touchegg.h -file - - - - -2011-03-23T00:27:30.468916Z -f02e85fc2d801e22bd0d8ab81ae2c547 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -1683 - -util -dir - -touchegg.pri -file - - - - -2011-03-23T00:27:30.468916Z -3c268d3fca4a63913f7838829adbfd65 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -554 - diff -Nru touchegg-0.3+repack/src/touchegg/.svn/text-base/Main.cpp.svn-base touchegg-1.0/src/touchegg/.svn/text-base/Main.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/.svn/text-base/Main.cpp.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/text-base/Main.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -/** - * @file /src/touchegg/Main.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @author José Expósito - */ -#include "src/touchegg/util/Include.h" -#include "src/touchegg/Touchegg.h" - -/** - * @~spanish - * Función de inicio de Touchégg. - * @param argc Número de argumentos recibidos por consola. - * @param argv Lista de argumentos. - * - * @~english - * Start function for Touchégg. - * @param argc Number of arguments received by console. - * @param argv Argument list. - */ -int main(int argc, char** argv) { - QApplication app(argc, argv); - Touchegg touchegg; - return app.exec(); -} diff -Nru touchegg-0.3+repack/src/touchegg/.svn/text-base/Touchegg.cpp.svn-base touchegg-1.0/src/touchegg/.svn/text-base/Touchegg.cpp.svn-base --- touchegg-0.3+repack/src/touchegg/.svn/text-base/Touchegg.cpp.svn-base 2011-04-27 00:50:57.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/text-base/Touchegg.cpp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/** - * @file /src/touchegg/Touchegg.cpp - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Touchegg - * @author José Expósito - */ -#include "Touchegg.h" - -// ************************************************************************** // -// ********** CONSTRUCTORS AND DESTRUCTOR ********** // -// ************************************************************************** // - -Touchegg::Touchegg() { - // Inicializamos la configuración - Config::loadConfig(); - - // Inicializamos los atributos - this->gestureCollector = new GestureCollector(); - this->gestureHandler = new GestureHandler(); - - // Conectamos GestureHandler con GestureHandler para que el último trate los - // eventos que recoge el primero. - qRegisterMetaType("GeisGestureType"); - qRegisterMetaType("GeisGestureId"); - - connect(gestureCollector, SIGNAL(executeGestureStart( - GeisGestureType,GeisGestureId,QHash)), - gestureHandler, SLOT(executeGestureStart( - GeisGestureType,GeisGestureId,QHash))); - connect(gestureCollector, SIGNAL(executeGestureUpdate( - GeisGestureType,GeisGestureId,QHash)), - gestureHandler, SLOT(executeGestureUpdate( - GeisGestureType,GeisGestureId,QHash))); - connect(gestureCollector, SIGNAL(executeGestureFinish( - GeisGestureType,GeisGestureId,QHash)), - gestureHandler, SLOT(executeGestureFinish( - GeisGestureType,GeisGestureId,QHash))); - - // Lanzamos GestureHandler en un hilo aparte para no congelar el bucle de - // eventos de Qt - this->gestureCollector->start(); -} - -Touchegg::~Touchegg() { - if(this->gestureCollector->isRunning()) - this->gestureCollector->exit(); - - delete this->gestureCollector; - delete this->gestureHandler; -} diff -Nru touchegg-0.3+repack/src/touchegg/.svn/text-base/Touchegg.h.svn-base touchegg-1.0/src/touchegg/.svn/text-base/Touchegg.h.svn-base --- touchegg-0.3+repack/src/touchegg/.svn/text-base/Touchegg.h.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/text-base/Touchegg.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * @file /src/touchegg/Touchegg.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @class Touchegg - * @author José Expósito - */ -#ifndef TOUCHEGG_H -#define TOUCHEGG_H - -#include "src/touchegg/util/Include.h" -#include "src/touchegg/config/Config.h" -#include "src/touchegg/gestures/handler/GestureHandler.h" -#include "src/touchegg/gestures/collector/GestureCollector.h" - -/** - * @~spanish - * Inicializa y lanza Touchégg. - * - * @~english - * Initializes and launch Touchégg. - */ -class Touchegg : public QObject { - - Q_OBJECT - - private: - - /** - * @~spanish - * Bucle que recoge todos los gestos producidos. - * - * @~english - * Loop that collects all the gestures produced. - */ - GestureCollector* gestureCollector; - - /** - * @~spanish - * Recoge todos los gestos que captura GestureCollector y los trata. - * - * @~english - * Collect all the gestures that captures GestureCollector and handle. - */ - GestureHandler* gestureHandler; - - public: - - /** - * @~spanish - * Inicializa y lanza Touchégg. - * - * @~english - * Initializes and launch Touchégg. - */ - Touchegg(); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~Touchegg(); -}; - -#endif // TOUCHEGG_H diff -Nru touchegg-0.3+repack/src/touchegg/.svn/text-base/touchegg.pri.svn-base touchegg-1.0/src/touchegg/.svn/text-base/touchegg.pri.svn-base --- touchegg-0.3+repack/src/touchegg/.svn/text-base/touchegg.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/.svn/text-base/touchegg.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -include(util/util.pri) -include(config/config.pri) - -include(gestures/collector/gestures.collector.pri) -include(gestures/handler/gestures.handler.pri) -include(gestures/factory/gestures.factory.pri) -include(gestures/implementation/gestures.implementation.pri) -include(gestures/types/gestures.types.pri) - -include(actions/implementation/actions.implementation.pri) -include(actions/types/actions.types.pri) -include(actions/factory/actions.factory.pri) - -HEADERS += \ - src/touchegg/Touchegg.h - -SOURCES += src/touchegg/Main.cpp \ - src/touchegg/Touchegg.cpp diff -Nru touchegg-0.3+repack/src/touchegg/Touchegg.cpp touchegg-1.0/src/touchegg/Touchegg.cpp --- touchegg-0.3+repack/src/touchegg/Touchegg.cpp 2011-04-13 10:52:42.000000000 +0000 +++ touchegg-1.0/src/touchegg/Touchegg.cpp 2011-09-03 18:57:35.000000000 +0000 @@ -1,16 +1,22 @@ /** * @file /src/touchegg/Touchegg.cpp * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 * @class Touchegg - * @author José Expósito */ #include "Touchegg.h" @@ -18,41 +24,128 @@ // ********** CONSTRUCTORS AND DESTRUCTOR ********** // // ************************************************************************** // -Touchegg::Touchegg() { - // Inicializamos la configuración - Config::loadConfig(); - - // Inicializamos los atributos - this->gestureCollector = new GestureCollector(); - this->gestureHandler = new GestureHandler(); - - // Conectamos GestureHandler con GestureHandler para que el último trate los - // eventos que recoge el primero. - qRegisterMetaType("GeisGestureType"); - qRegisterMetaType("GeisGestureId"); +Touchegg::Touchegg(int argc, char** argv) + : QApplication(argc, argv), + gestureCollector(new GestureCollector), + gestureHandler(new GestureHandler), + clientList(this->getClientList()) +{ + // Inicializamos Touchégg cuando uTouch esté listo + connect(this->gestureCollector, SIGNAL(ready()), this, SLOT(start())); + // Conectamos el GestureCollector con el GestureHandler para que el último + // trate los eventos que recoge el primero connect(gestureCollector, SIGNAL(executeGestureStart( - GeisGestureType,GeisGestureId,QHash)), + QString,int,QHash)), gestureHandler, SLOT(executeGestureStart( - GeisGestureType,GeisGestureId,QHash))); + QString,int,QHash))); connect(gestureCollector, SIGNAL(executeGestureUpdate( - GeisGestureType,GeisGestureId,QHash)), + QString,int,QHash)), gestureHandler, SLOT(executeGestureUpdate( - GeisGestureType,GeisGestureId,QHash))); + QString,int,QHash))); connect(gestureCollector, SIGNAL(executeGestureFinish( - GeisGestureType,GeisGestureId,QHash)), + QString,int,QHash)), gestureHandler, SLOT(executeGestureFinish( - GeisGestureType,GeisGestureId,QHash))); - - // Lanzamos GestureHandler en un hilo aparte para no congelar el bucle de - // eventos de Qt - this->gestureCollector->start(); + QString,int,QHash))); } -Touchegg::~Touchegg() { - if(this->gestureCollector->isRunning()) - this->gestureCollector->exit(); - +Touchegg::~Touchegg() +{ delete this->gestureCollector; delete this->gestureHandler; } + + +// ************************************************************************** // +// ********** PRIVATE SLOTS ********** // +// ************************************************************************** // + +void Touchegg::start() +{ + // Nos suscribimos a los gestos globales + this->gestureCollector->addWindow(QX11Info::appRootWindow()); + + // Obtenemos la lista actual de ventanas para suscribirnos a ellas + this->clientList = this->getClientList(); + + foreach(Window w, this->clientList) { + this->gestureCollector->addWindow(w); + } +} + + +// ************************************************************************** // +// ********** PROTECTED METHODS ********** // +// ************************************************************************** // + +bool Touchegg::x11EventFilter(XEvent* event) +{ + if(event->type == PropertyNotify && event->xproperty.atom == XInternAtom( + QX11Info::display(), "_NET_CLIENT_LIST", false)) { + bool isNew; + QList oldList = this->clientList; + this->clientList = this->getClientList(); + + Window w = this->getDifferentWindow(this->clientList, oldList, &isNew); + + if(w != None) { + if(isNew) + this->gestureCollector->addWindow(w); + else + this->gestureCollector->removeWindow(w); + } + + } + return false; +} + + +// ************************************************************************** // +// ********** PRIVATE METHODS ********** // +// ************************************************************************** // + +QList Touchegg::getClientList() const +{ + Atom atomRet; + int size; + unsigned long numItems, bytesAfterReturn; + unsigned char* propRet; + long offset = 0; + long offsetSize = 100; + int status; + Atom atomList = XInternAtom(QX11Info::display(), "_NET_CLIENT_LIST", false); + QList ret; + + do { + status = XGetWindowProperty(QX11Info::display(), + QX11Info::appRootWindow(), atomList, offset, offsetSize, false, + XA_WINDOW, &atomRet,&size,&numItems,&bytesAfterReturn,&propRet); + + if(status == Success) { + Window* aux = (Window*)propRet; + unsigned int n=0; + while(n < numItems) { + ret.append(aux[n]); + n++; + } + offset += offsetSize; + XFree(propRet); + } + } while(status == Success && bytesAfterReturn != 0); + + return ret; +} + +Window Touchegg::getDifferentWindow(QList lnew, QList lold, + bool* isNew) const +{ + if(lnew == lold) { + return None; + } else { + // Como _NET_CLIENT_LIST lleva un orden de primero las ventanas viejas y + // luego las nuevas, nos basta con devolver la última ventana de la + // lista más larga + *isNew = lnew.length() > lold.length(); + return lnew.length() > lold.length() ? lnew.last() : lold.last(); + } +} diff -Nru touchegg-0.3+repack/src/touchegg/Touchegg.h touchegg-1.0/src/touchegg/Touchegg.h --- touchegg-0.3+repack/src/touchegg/Touchegg.h 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/Touchegg.h 2011-09-03 18:54:48.000000000 +0000 @@ -1,75 +1,189 @@ /** * @file /src/touchegg/Touchegg.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. + * + * Touchégg 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 + * Touchégg. If not, see . * + * @author José Expósito (C) 2011 * @class Touchegg - * @author José Expósito */ #ifndef TOUCHEGG_H #define TOUCHEGG_H #include "src/touchegg/util/Include.h" -#include "src/touchegg/config/Config.h" -#include "src/touchegg/gestures/handler/GestureHandler.h" #include "src/touchegg/gestures/collector/GestureCollector.h" +#include "src/touchegg/gestures/handler/GestureHandler.h" /** * @~spanish - * Inicializa y lanza Touchégg. + * Inicializa y conecta el GestureCollector y el GestureHandler. Además escucha + * la creación/destrucción de ventanas, indicandoselo al GestureCollector. * * @~english - * Initializes and launch Touchégg. + * Initializes and connect the GestureCollector and the GestureHandler. In + * addition, listens for the creation/destruction of windows, sending signals to + * the GestureCollector. */ -class Touchegg : public QObject { - +class Touchegg : public QApplication +{ Q_OBJECT - private: +private: + + /** + * @~spanish + * Bucle que recoge todos los gestos producidos. + * + * @~english + * Loop that collects all the gestures produced. + */ + GestureCollector* gestureCollector; + + /** + * @~spanish + * Recoge todos los gestos que captura GestureCollector y los trata. + * + * @~english + * Collect all the gestures that captures GestureCollector and handle. + */ + GestureHandler* gestureHandler; + + /** + * @~spanish + * Lista con las ventanas existentes. Es necesaria para poder subscribirnos + * a los eventos multitouch de las ventanas que lo requieran. + * + * @~englis + * List with the existing windows. Is necessary for subscribe to de + * multitouch events to the windows that requires it. + */ + QList clientList; + + //-------------------------------------------------------------------------- + + /** + * @~spanish + * Devuelve la lista de ventanas existentes. + * @return Dicha lista. + * + * @~english + * Returns the list of existing windows. + * @return The list. + */ + QList getClientList() const; + + /** + * @~spanish + * Dadas dos listas de ventanas devuelve la diferencia entre ellas, que + * coincidirá con la última ventana creada/eliminada. + * @param lnew La lista con las ventanas nuevas. + * @param lold La lista con las ventanas viejas. + * @param isNew true si la ventana devuelta ha sido creada, false si ha + * sido eliminada. + * @return La ventana creada/eliminada o None si las dos listas son iguales. + * + * @~english + * Given two lists of windows returns the difference between them, + * corresponding to the last window created/deleted. + * @param lnew The list with the new windows. + * @param lold The list with the old windows. + * @param isNew true if the returned window has been created, false if has + * been deleted. + * @return The created/deleted window or None if the two list are equals. + */ + Window getDifferentWindow(QList lnew, QList lold, + bool* isNew) const; + +protected: + + /** + * @~spanish + * Reimplementa el método QApplication::x11EventFilter. En este método se + * recibirán las notificaciones de creación/destrucción de ventanas (previa + * llamada a XSelectInput en el constructor) y se gestionarán como + * corresponda. + * @param event El evento que se ha producido. + * @return true para evitar que el evento sea tratado con normalidad, es + * decir, cuando ya lo tratamos nosotros, false para que el + * evento se trate connormalidad. + * + * @~english + * Reimplement the method QApplication::x11EventFilter. This method receives + * the notifications of creation/destruction of windows (previously calling + * XSelectInput function in the constructor) and manage it as appropiate + * using the correct event handler. + * @param event The event that occurred. + * @return true if you want to stop the event from being processed, ie + * when we treat ourselves, false for normal event dispatching. + */ + virtual bool x11EventFilter(XEvent* event); + +public: + + /** + * @~spanish + * Inicializa Touchégg. + * + * @~english + * Initializes Touchégg. + */ + Touchegg(int argc, char** argv); + + /** + * @~spanish + * Destructor. + * + * @~english + * Destructor. + */ + virtual ~Touchegg(); + +private slots: + + /** + * @~spanish + * Lanza Touchégg + * + * @~english + * Launch Touchégg. + */ + void start(); + +signals: + + /** + * @~spanish + * Señal que se envía al GestureCollector para que escuche los eventos + * multitouch en la ventana indicada. + * + * @~english + * Signal that is send to the GestureCollector for listen the multitouch + * events in the specified window. + */ + void addListener(Window w); + + /** + * @~spanish + * Señal que se envía al GestureCollector para que deje de escuchar los + * eventos multitouch en la ventana indicada. + * + * @~english + * Signal that is send to the GestureCollector for stop listen the + * multitouch events in the specified window. + */ + void removeListener(Window w); - /** - * @~spanish - * Bucle que recoge todos los gestos producidos. - * - * @~english - * Loop that collects all the gestures produced. - */ - GestureCollector* gestureCollector; - - /** - * @~spanish - * Recoge todos los gestos que captura GestureCollector y los trata. - * - * @~english - * Collect all the gestures that captures GestureCollector and handle. - */ - GestureHandler* gestureHandler; - - public: - - /** - * @~spanish - * Inicializa y lanza Touchégg. - * - * @~english - * Initializes and launch Touchégg. - */ - Touchegg(); - - /** - * @~spanish - * Destructor. - * - * @~english - * Destructor. - */ - virtual ~Touchegg(); }; #endif // TOUCHEGG_H diff -Nru touchegg-0.3+repack/src/touchegg/touchegg.pri touchegg-1.0/src/touchegg/touchegg.pri --- touchegg-0.3+repack/src/touchegg/touchegg.pri 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/touchegg.pri 2011-07-11 06:37:05.000000000 +0000 @@ -7,9 +7,9 @@ include(gestures/implementation/gestures.implementation.pri) include(gestures/types/gestures.types.pri) -include(actions/implementation/actions.implementation.pri) include(actions/types/actions.types.pri) include(actions/factory/actions.factory.pri) +include(actions/implementation/actions.implementation.pri) HEADERS += \ src/touchegg/Touchegg.h diff -Nru touchegg-0.3+repack/src/touchegg/util/Include.h touchegg-1.0/src/touchegg/util/Include.h --- touchegg-0.3+repack/src/touchegg/util/Include.h 2011-04-17 17:01:53.000000000 +0000 +++ touchegg-1.0/src/touchegg/util/Include.h 2011-07-11 09:27:24.000000000 +0000 @@ -1,15 +1,21 @@ /** * @file /src/touchegg/util/Include.h * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. + * This file is part of Touchégg. * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. + * Touchégg 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 3 of the License, or (at your option) any later + * version. * - * @author José Expósito + * Touchégg 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 + * Touchégg. If not, see . + * + * @author José Expósito (C) 2011 */ #ifndef INCLUDE_H #define INCLUDE_H @@ -18,6 +24,7 @@ #include #include #include + #include // Xlib #include diff -Nru touchegg-0.3+repack/src/touchegg/util/.svn/all-wcprops touchegg-1.0/src/touchegg/util/.svn/all-wcprops --- touchegg-0.3+repack/src/touchegg/util/.svn/all-wcprops 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/util/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 43 -/svn/!svn/ver/97/touchegg/src/touchegg/util -END -util.pri -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/97/touchegg/src/touchegg/util/util.pri -END -Include.h -K 25 -svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/109/touchegg/src/touchegg/util/Include.h -END diff -Nru touchegg-0.3+repack/src/touchegg/util/.svn/entries touchegg-1.0/src/touchegg/util/.svn/entries --- touchegg-0.3+repack/src/touchegg/util/.svn/entries 2011-04-27 00:51:10.000000000 +0000 +++ touchegg-1.0/src/touchegg/util/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg/src/touchegg/util -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -util.pri -file - - - - -2011-03-23T00:27:30.468916Z -c17f42bb203cf98578354d352e1e2d32 -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -39 - -Include.h -file -109 - - - -2011-04-17T17:01:53.918741Z -20eceddc588e99f4415e681f1ed8beab -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -724 - diff -Nru touchegg-0.3+repack/src/touchegg/util/.svn/text-base/Include.h.svn-base touchegg-1.0/src/touchegg/util/.svn/text-base/Include.h.svn-base --- touchegg-0.3+repack/src/touchegg/util/.svn/text-base/Include.h.svn-base 2011-04-27 00:50:58.000000000 +0000 +++ touchegg-1.0/src/touchegg/util/.svn/text-base/Include.h.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/** - * @file /src/touchegg/util/Include.h - * - * @~spanish - * Este archivo es parte del proyecto Touchégg, usted puede redistribuirlo y/o - * modificarlo bajo los téminos de la licencia GNU GPL v3. - * - * @~english - * This file is part of the Touchégg project, you can redistribute it and/or - * modify it under the terms of the GNU GPL v3. - * - * @author José Expósito - */ -#ifndef INCLUDE_H -#define INCLUDE_H - - // Qt - #include - #include - #include - - // Xlib - #include - #include - #include - #include - - // uTouch - #include - - // Others - #include - -#endif // INCLUDE_H diff -Nru touchegg-0.3+repack/src/touchegg/util/.svn/text-base/util.pri.svn-base touchegg-1.0/src/touchegg/util/.svn/text-base/util.pri.svn-base --- touchegg-0.3+repack/src/touchegg/util/.svn/text-base/util.pri.svn-base 2011-03-23 00:27:30.000000000 +0000 +++ touchegg-1.0/src/touchegg/util/.svn/text-base/util.pri.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -HEADERS += src/touchegg/util/Include.h diff -Nru touchegg-0.3+repack/.svn/all-wcprops touchegg-1.0/.svn/all-wcprops --- touchegg-0.3+repack/.svn/all-wcprops 2011-04-27 23:31:16.000000000 +0000 +++ touchegg-1.0/.svn/all-wcprops 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 25 -/svn/!svn/ver/97/touchegg -END -touchegg.pro -K 25 -svn:wc:ra_dav:version-url -V 39 -/svn/!svn/ver/109/touchegg/touchegg.pro -END -README -K 25 -svn:wc:ra_dav:version-url -V 33 -/svn/!svn/ver/116/touchegg/README -END diff -Nru touchegg-0.3+repack/.svn/entries touchegg-1.0/.svn/entries --- touchegg-0.3+repack/.svn/entries 2011-04-28 00:29:27.000000000 +0000 +++ touchegg-1.0/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -10 - -dir -97 -https://touchegg.googlecode.com/svn/touchegg -https://touchegg.googlecode.com/svn - - - -2011-03-23T00:23:43.241781Z -97 -jose.exposito89 - - - - - - - - - - - - - - -6a4e8e67-9c2c-2891-b3ed-1ffe352c353b - -build -dir - -installation -dir - -debian -dir - -touchegg.pro -file -109 - - - -2011-04-17T17:01:53.918741Z -63afbb6cfca3e9e1c0e3e038ba2f60a2 -2011-04-27T00:50:43.741348Z -109 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -610 - -src -dir - -documentation -dir - -README -file -116 - - - -2011-04-27T22:30:20.355655Z -3005a5d1f4e6266365a259d054d0276b -2011-04-27T23:30:56.262500Z -116 -jose.exposito89 - - - - - - - - - - - - - - - - - - - - - -344 - diff -Nru touchegg-0.3+repack/.svn/text-base/README.svn-base touchegg-1.0/.svn/text-base/README.svn-base --- touchegg-0.3+repack/.svn/text-base/README.svn-base 2011-04-27 23:31:11.000000000 +0000 +++ touchegg-1.0/.svn/text-base/README.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -1 - Compile and install Touchégg: - https://code.google.com/p/touchegg/wiki/CompileSourceCode - -2 - Run Touchégg: - $ touchegg - -3 - Make a gesture, for example drag two fingers over your trackpad. If all - works fine, the name of the gesture will appear. - -4 - To use your own configuration edit ~/.touchegg/touchegg.conf or use the GUI. diff -Nru touchegg-0.3+repack/.svn/text-base/touchegg.pro.svn-base touchegg-1.0/.svn/text-base/touchegg.pro.svn-base --- touchegg-0.3+repack/.svn/text-base/touchegg.pro.svn-base 2011-04-27 00:51:00.000000000 +0000 +++ touchegg-1.0/.svn/text-base/touchegg.pro.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -TEMPLATE = app -TARGET = touchegg -QT += core gui -OBJECTS_DIR += build -MOC_DIR += build -LIBS += -lutouch-geis -lX11 -lXtst -lXext -//DEFINES = QT_NO_DEBUG_OUTPUT - - -target.path = /usr/bin -config.path = /usr/share/touchegg -config.files = installation/touchegg.conf -menu.path = /usr/share/applications -menu.files = installation/touchegg.desktop -icon.path = /usr/share/icons -icon.files = installation/touchegg.png -INSTALLS += target config menu icon - - -include(src/touchegg/touchegg.pri) - -OTHER_FILES += \ - documentation/doxyfile_es \ - documentation/doxyfile_en diff -Nru touchegg-0.3+repack/touchegg.pro touchegg-1.0/touchegg.pro --- touchegg-0.3+repack/touchegg.pro 2011-04-17 17:01:53.000000000 +0000 +++ touchegg-1.0/touchegg.pro 2011-09-02 18:22:50.000000000 +0000 @@ -1,24 +1,23 @@ TEMPLATE = app TARGET = touchegg -QT += core gui +QT += gui core xml OBJECTS_DIR += build MOC_DIR += build LIBS += -lutouch-geis -lX11 -lXtst -lXext //DEFINES = QT_NO_DEBUG_OUTPUT - target.path = /usr/bin config.path = /usr/share/touchegg config.files = installation/touchegg.conf -menu.path = /usr/share/applications -menu.files = installation/touchegg.desktop -icon.path = /usr/share/icons -icon.files = installation/touchegg.png -INSTALLS += target config menu icon +INSTALLS += target config include(src/touchegg/touchegg.pri) OTHER_FILES += \ documentation/doxyfile_es \ - documentation/doxyfile_en + documentation/doxyfile_en \ + README \ + COPYING \ + CHANGELOG \ + COPYRIGHT