From 9b1b081cfdb1c0fb6457278775e0823f8bc10f62 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 25 Apr 2018 18:07:30 -0400 Subject: Import Upstream version 2.0.0+dfsg --- doc/MacReadme.txt | 15 ++ doc/QtCodeStyle.xml | 234 ++++++++++++++++++++++++++++++++ doc/UpdateManpages.txt | 5 + doc/barrier.conf.example | 37 +++++ doc/barrier.conf.example-advanced | 55 ++++++++ doc/barrier.conf.example-basic | 39 ++++++ doc/barrierc.1 | 72 ++++++++++ doc/barriers.1 | 81 +++++++++++ doc/org.barrier-foss.org.barrierc.plist | 20 +++ doc/org.barrier-foss.org.barriers.plist | 22 +++ 10 files changed, 580 insertions(+) create mode 100644 doc/MacReadme.txt create mode 100644 doc/QtCodeStyle.xml create mode 100644 doc/UpdateManpages.txt create mode 100644 doc/barrier.conf.example create mode 100644 doc/barrier.conf.example-advanced create mode 100644 doc/barrier.conf.example-basic create mode 100644 doc/barrierc.1 create mode 100644 doc/barriers.1 create mode 100644 doc/org.barrier-foss.org.barrierc.plist create mode 100644 doc/org.barrier-foss.org.barriers.plist (limited to 'doc') diff --git a/doc/MacReadme.txt b/doc/MacReadme.txt new file mode 100644 index 0000000..9e194e1 --- /dev/null +++ b/doc/MacReadme.txt @@ -0,0 +1,15 @@ +Mac OS X Readme +=============== + +To install on Mac OS X with the .zip distribution (first seen in 1.3.6) you must follow these steps: + + 1. Extract the zip file to any location (usually double click will do this) + 2. Open Terminal, and cd to the extracted directory (e.g. /Users/my-name/Downloads/extracted-dir/) + 3. Copy the binaries to /usr/bin using: sudo cp barrier* /usr/bin + 4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/barrier*; sudo chmod 555 /usr/bin/barrier* + +Alternatively, you can copy the binaries as root. How to enable the root user in Mac OS X: + http://support.apple.com/en-us/ht1528 + +Once the binaries have been copied to /usr/bin, you should follow the configuration guide: + http://synergy2.sourceforge.net/configuration.html diff --git a/doc/QtCodeStyle.xml b/doc/QtCodeStyle.xml new file mode 100644 index 0000000..e621c4f --- /dev/null +++ b/doc/QtCodeStyle.xml @@ -0,0 +1,234 @@ + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + + + + + + + CodeStyleData + + false + false + true + false + false + false + true + false + true + false + false + false + true + true + false + true + false + false + false + 4 + true + false + 2 + false + 4 + + + + DisplayName + Barrier + + diff --git a/doc/UpdateManpages.txt b/doc/UpdateManpages.txt new file mode 100644 index 0000000..cdbe86f --- /dev/null +++ b/doc/UpdateManpages.txt @@ -0,0 +1,5 @@ +To recreate the barrierc manpage use a command like: + help2man -N --output=barrierc.1 --name='Barrier Keyboard/Mouse Client' /path/to/barrierc + +And for barriers: + help2man -N --output=barriers.1 --name='Barrier Keyboard/Mouse Server' /path/to/barriers diff --git a/doc/barrier.conf.example b/doc/barrier.conf.example new file mode 100644 index 0000000..5815875 --- /dev/null +++ b/doc/barrier.conf.example @@ -0,0 +1,37 @@ +# sample barrier configuration file +# +# comments begin with the # character and continue to the end of +# line. comments may appear anywhere the syntax permits. + +section: screens + # three hosts named: moe, larry, and curly + moe: + larry: + curly: +end + +section: links + # larry is to the right of moe and curly is above moe + moe: + right = larry + up = curly + + # moe is to the left of larry and curly is above larry. + # note that curly is above both moe and larry and moe + # and larry have a symmetric connection (they're in + # opposite directions of each other). + larry: + left = moe + up = curly + + # larry is below curly. if you move up from moe and then + # down, you'll end up on larry. + curly: + down = larry +end + +section: aliases + # curly is also known as shemp + curly: + shemp +end diff --git a/doc/barrier.conf.example-advanced b/doc/barrier.conf.example-advanced new file mode 100644 index 0000000..ad9df29 --- /dev/null +++ b/doc/barrier.conf.example-advanced @@ -0,0 +1,55 @@ +# sample barrier configuration file +# +# comments begin with the # character and continue to the end of +# line. comments may appear anywhere the syntax permits. + +# This example uses 3 computers. A laptop and two desktops (one a mac) +# They are arranged in the following configuration with Desktop1 acting as the server +# Desktop 2 has 3 screens arranged around desktop1 +# +# +--------+ +---------+ +# |Desktop2| |Desktop2 | +# | | | | +# +--------+ +---------+ +# +-------+ +--------+ +---------+ +# |Laptop | |Desktop1| |Desktop2 | +# | | | | | | +# +-------+ +--------+ +---------+ +# +# The laptop comes and goes but that doesn't really affect this configuration + +# The screens section is for the logical or short name of the computers +section: screens + # three computers that are logically named: desktop1, desktop2, and laptop + desktop1: + desktop2: + laptop: +end + +section: links + # larry is to the right of moe and curly is above moe + moe: + right = larry + up = curly + + # moe is to the left of larry and curly is above larry. + # note that curly is above both moe and larry and moe + # and larry have a symmetric connection (they're in + # opposite directions of each other). + larry: + left = moe + up = curly + + # larry is below curly. if you move up from moe and then + # down, you'll end up on larry. + curly: + down = larry +end + +# The aliases section is to map the full names of the computers to their logical names used in the screens section +# One way to find the actual name of a comptuer is to run hostname from a command window +section: aliases + # Laptop is actually known as John-Smiths-MacBook-3.local + desktop2: + John-Smiths-MacBook-3.local +end diff --git a/doc/barrier.conf.example-basic b/doc/barrier.conf.example-basic new file mode 100644 index 0000000..39ff6d6 --- /dev/null +++ b/doc/barrier.conf.example-basic @@ -0,0 +1,39 @@ +# sample barrier configuration file +# +# comments begin with the # character and continue to the end of +# line. comments may appear anywhere the syntax permits. +# +-------+ +--------+ +---------+ +# |Laptop | |Desktop1| |iMac | +# | | | | | | +# +-------+ +--------+ +---------+ + +section: screens + # three hosts named: Laptop, Desktop1, and iMac + # These are the nice names of the hosts to make it easy to write the config file + # The aliases section below contain the "actual" names of the hosts (their hostnames) + Laptop: + Desktop1: + iMac: +end + +section: links + # iMac is to the right of Desktop1 + # Laptop is to the left of Desktop1 + Desktop1: + right = iMac + left = Laptop + + # Desktop1 is to the right of Laptop + Laptop: + right = Desktop1 + + # Desktop1 is to the left of iMac + iMac: + left = Desktop1 +end + +section: aliases + # The "real" name of iMac is John-Smiths-iMac-3.local. If we wanted we could remove this alias and instead use John-Smiths-iMac-3.local everywhere iMac is above. Hopefully it should be easy to see why using an alias is nicer + iMac: + John-Smiths-iMac-3.local +end diff --git a/doc/barrierc.1 b/doc/barrierc.1 new file mode 100644 index 0000000..404df90 --- /dev/null +++ b/doc/barrierc.1 @@ -0,0 +1,72 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BARRIERC "1" "March 2018" "barrierc 2.0.0, protocol version 1.6" "User Commands" +.SH NAME +barrierc \- Barrier Keyboard/Mouse Client +.SH SYNOPSIS +.B barrierc +[\fI\,--yscroll \/\fR] [\fI\,--display \/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name \/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug \/\fR] \fI\,\/\fR +.SH DESCRIPTION +Start the barrier client and connect to a remote server component. +.SH OPTIONS +.TP +\fB\-d\fR, \fB\-\-debug\fR +filter out log messages with priority below level. +level may be: FATAL, ERROR, WARNING, NOTE, INFO, +DEBUG, DEBUG1, DEBUG2. +.TP +\fB\-n\fR, \fB\-\-name\fR use screen\-name instead the hostname to identify +this screen in the configuration. +.TP +\fB\-1\fR, \fB\-\-no\-restart\fR +do not try to restart on failure. +.TP +\fB\-\-restart\fR +restart the server automatically if it fails. (*) +.TP +\fB\-l\fR \fB\-\-log\fR +write log messages to file. +.TP +\fB\-\-no\-tray\fR +disable the system tray icon. +.TP +\fB\-\-enable\-drag\-drop\fR +enable file drag & drop. +.TP +\fB\-\-enable\-crypto\fR +enable the crypto (ssl) plugin. +.TP +\fB\-\-display\fR +connect to the X server at +.TP +\fB\-\-no\-xinitthreads\fR +do not call XInitThreads() +.TP +\fB\-f\fR, \fB\-\-no\-daemon\fR +run in the foreground. +.TP +\fB\-\-daemon\fR +run as a daemon. (*) +.TP +\fB\-\-yscroll\fR +defines the vertical scrolling delta, which is +120 by default. +.TP +\fB\-h\fR, \fB\-\-help\fR +display this help and exit. +.TP +\fB\-\-version\fR +display version information and exit. +.PP +Default options are marked with a * +.PP +The server address is of the form: [][:]. The hostname +must be the address or hostname of the server. The port overrides the +default port, 24800. +.SH COPYRIGHT +Copyright \(co 2018 Debauchee Open Source Group +.br +Copyright \(co 2012\-2016 Symless Ltd. +.br +Copyright \(co 2008\-2014 Nick Bolton +.br +Copyright \(co 2002\-2014 Chris Schoeneman diff --git a/doc/barriers.1 b/doc/barriers.1 new file mode 100644 index 0000000..655d417 --- /dev/null +++ b/doc/barriers.1 @@ -0,0 +1,81 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BARRIERS "1" "March 2018" "barriers 2.0.0, protocol version 1.6" "User Commands" +.SH NAME +barriers \- Barrier Keyboard/Mouse Server +.SH SYNOPSIS +.B barriers +[\fI\,--address
\/\fR] [\fI\,--config \/\fR] [\fI\,--display \/\fR] [\fI\,--no-xinitthreads\/\fR] [\fI\,--daemon|--no-daemon\/\fR] [\fI\,--name \/\fR] [\fI\,--restart|--no-restart\/\fR] [\fI\,--debug \/\fR] +.SH DESCRIPTION +Start the barrier server component. +.SH OPTIONS +.TP +\fB\-a\fR, \fB\-\-address\fR
+listen for clients on the given address. +.TP +\fB\-c\fR, \fB\-\-config\fR +use the named configuration file instead. +.TP +\fB\-d\fR, \fB\-\-debug\fR +filter out log messages with priority below level. +level may be: FATAL, ERROR, WARNING, NOTE, INFO, +DEBUG, DEBUG1, DEBUG2. +.TP +\fB\-n\fR, \fB\-\-name\fR use screen\-name instead the hostname to identify +this screen in the configuration. +.TP +\fB\-1\fR, \fB\-\-no\-restart\fR +do not try to restart on failure. +.TP +\fB\-\-restart\fR +restart the server automatically if it fails. (*) +.TP +\fB\-l\fR \fB\-\-log\fR +write log messages to file. +.TP +\fB\-\-no\-tray\fR +disable the system tray icon. +.TP +\fB\-\-enable\-drag\-drop\fR +enable file drag & drop. +.TP +\fB\-\-enable\-crypto\fR +enable the crypto (ssl) plugin. +.TP +\fB\-\-display\fR +connect to the X server at +.TP +\fB\-\-no\-xinitthreads\fR +do not call XInitThreads() +.TP +\fB\-f\fR, \fB\-\-no\-daemon\fR +run in the foreground. +.TP +\fB\-\-daemon\fR +run as a daemon. (*) +.TP +\fB\-h\fR, \fB\-\-help\fR +display this help and exit. +.TP +\fB\-\-version\fR +display version information and exit. +.PP +Default options are marked with a * +.PP +The argument for \fB\-\-address\fR is of the form: [][:]. The +hostname must be the address or hostname of an interface on the system. +The default is to listen on all interfaces. The port overrides the +default port, 24800. +.PP +If no configuration file pathname is provided then the first of the +following to load successfully sets the configuration: +.IP +$HOME/.barrier.conf +\fI\,/etc/barrier.conf\/\fP +.SH COPYRIGHT +Copyright \(co 2018 Debauchee Open Source Group +.br +Copyright \(co 2012\-2016 Symless Ltd. +.br +Copyright \(co 2008\-2014 Nick Bolton +.br +Copyright \(co 2002\-2014 Chris Schoeneman diff --git a/doc/org.barrier-foss.org.barrierc.plist b/doc/org.barrier-foss.org.barrierc.plist new file mode 100644 index 0000000..31e10ba --- /dev/null +++ b/doc/org.barrier-foss.org.barrierc.plist @@ -0,0 +1,20 @@ + + + + + + Label + org.debauchee.com.barrierc.plist + OnDemand + + ProgramArguments + + /usr/bin/barrierc + + 192.168.0.2 + + RunAtLoad + + + diff --git a/doc/org.barrier-foss.org.barriers.plist b/doc/org.barrier-foss.org.barriers.plist new file mode 100644 index 0000000..f1ab5bf --- /dev/null +++ b/doc/org.barrier-foss.org.barriers.plist @@ -0,0 +1,22 @@ + + + + + + Label + org.debauchee.com.barriers.plist + OnDemand + + ProgramArguments + + /usr/bin/barriers + --no-daemon + --config + + /Users/snorp/.barrier.conf + + RunAtLoad + + + -- cgit v1.2.3