summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
* Merge pull request #1187 from 4e554c4c/masterLibravatar Drew DeVault2017-04-24
|\ | | | | Fix typo in sway(5)
| * Fix typo in sway(5)Libravatar Calvin Lee2017-04-23
|/
* Merge pull request #1184 from JerziKaminsky/logging2Libravatar Drew DeVault2017-04-20
|\ | | | | More Logging Fixes
| * Merge branch 'master' into logging2Libravatar Drew DeVault2017-04-20
| |\ | |/ |/|
* | Merge pull request #1183 from sleep-walker/masterLibravatar Drew DeVault2017-04-19
|\ \ | | | | | | explicitly ignore unused return value
| | * Make sway_abort() report locationLibravatar Jerzi Kaminsky2017-04-20
| |/
| * explicitly ignore unused return valueLibravatar Tomáš Čech2017-04-19
|/ | | | fixes issue#1182
* Merge pull request #1181 from wasamasa/bugfix-initial-scratchpad-size0.13-rc1Libravatar Drew DeVault2017-04-18
|\ | | | | Use i3's dimensions for initial scratchpad views
| * Use i3's dimensions for initial scratchpad viewsLibravatar Vasilij Schneidermann2017-04-18
| | | | | | | | See https://github.com/i3/i3/blob/master/src/scratchpad.c#L196-L197
* | Merge pull request #1178 from 4e554c4c/forkLibravatar Drew DeVault2017-04-18
|\ \ | |/ |/| Prevent sway from duplicating on a failed fork
| * Prevent sway from duplicating on a failed forkLibravatar Calvin Lee2017-04-18
| | | | | | | | Also remove a useless `sway_log` and replace it with a pipe
* | Merge pull request #1180 from wasamasa/feature-move-to-scratchpadLibravatar Drew DeVault2017-04-18
|\ \ | | | | | | Feature move to scratchpad
| * | Implement and document `move [to] scratchpad`Libravatar Vasilij Schneidermann2017-04-18
|/ /
* / Add .build.yml (for builds.sr.ht)Libravatar Drew DeVault2017-04-18
|/
* Merge pull request #1173 from JerziKaminsky/security_resolve_symlinkLibravatar Drew DeVault2017-04-16
|\ | | | | FOR_REVIEW: IPC security - Allow policy targets to be symlinks
| * Handle symlinks as IPC security targetsLibravatar Jerzi Kaminsky2017-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When policies are allocated, the ipc target path goes through symlink resolution. The result is used as the canonical for matching pids to policies at runtime. In particular, this matches up with the target of the `/proc/<pid>/exe`. - There's a possible race condition if this isn't done correctly, read below. Originally, validate_ipc_target() always tried to resolve its argument for symlinks, and returned a parogram target string if it validates. This created a possible race condition with security implications. The problem is that get_feature_policy() first independently resolved the policy target in order to check whether a policy already exists. If it didn't find any, it called alloc_feature_policy() which called validate_ipc_target() which resolved the policy target again. In the time between the two checks, the symlink could be altered, and a lucky attacker could fool the program into thinking that a policy doesn't exist for a target, and then switch the symlink to point at another file. At the very least this could allow him to create two policies for the same program target, and possibly to bypass security by associating the permissions for one target with another, or force default permissions to apply to a target for which a more specific rule has been configured. So we don't that. Instead, the policy target is resolved once and that result is used for the rest of the lookup/creation process.
| * Add resolve_path() to utilsLibravatar Jerzi Kaminsky2017-04-16
| |
| * Add validate_ipc_target()Libravatar Jerzi Kaminsky2017-04-16
| |
| * Move get_feature_policy to sway/security.cLibravatar Jerzi Kaminsky2017-04-16
| |
| * Rename get_policy to get_feature_policyLibravatar Jerzi Kaminsky2017-04-16
| |
| * Disambiguate get_*_policy() and get_*_policy_mask()Libravatar Jerzi Kaminsky2017-04-16
|/
* Merge pull request #1175 from JerziKaminsky/fix_sway_assert_variadicLibravatar Drew DeVault2017-04-16
|\ | | | | Fix multiple issues in sway_assert
| * Fix location reported by sway_assertLibravatar Jerzi Kaminsky2017-04-16
| |
| * Fix variadic forwarding in sway_assertLibravatar Jerzi Kaminsky2017-04-16
|/ | | | | | | | _sway_assert is a variadic function which tries to delegate to another variadic function. This requires a vprintf-style variant of the delegate. https://stackoverflow.com/a/150616
* Merge pull request #1171 from JerziKaminsky/misc_fixesLibravatar Drew DeVault2017-04-14
|\ | | | | Misc fixes
| * Fix style in sway-bar(5) manpageLibravatar Jerzi Kaminsky2017-04-14
| |
| * Remain compat with libinput < 1.7.0Libravatar Jerzi Kaminsky2017-04-14
| |
* | Merge pull request #1147 from SirCmpwn/nvidia-supportLibravatar Drew DeVault2017-04-12
|\| | | | | Downgrade nvidia proprietary driver warning
| * Implement more thourough nvidia config checkLibravatar Drew DeVault2017-04-12
| |
| * Downgrade nvidia proprietary driver warningLibravatar Drew DeVault2017-04-12
|/
* Merge pull request #1146 from SirCmpwn/pretty-print-swaymsgLibravatar Drew DeVault2017-04-10
|\ | | | | Add pretty printing to swaymsg
| * Merge branch 'master' into pretty-print-swaymsgLibravatar Drew DeVault2017-04-10
| |\ | |/ |/|
* | Merge pull request #1150 from JerziKaminsky/cmake_find_libcapLibravatar Drew DeVault2017-04-08
|\ \ | | | | | | Add libcap check to CMake
| * | Add libcap check to CMakeLibravatar JerziKaminsky2017-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved ``<sys/capability.h>`` include inside `__linux__` guard, because all uses are similarly guarded. - <sys/capability.h> is part of an optional devel package, at least in fedora. CMake now explicitly checks that libcap devel files are available. - Added libcap to the list of install packages in .travis.yml, to make the dependency explicit. travis-ci installs the package by default, which is why this hasn't surfaced previously.
* | | Merge pull request #1155 from 4e554c4c/get_marksLibravatar Drew DeVault2017-04-07
|\ \ \ | | | | | | | | Add `-t get_marks` and use more i3-like marks
| * | | Add `-t get_marks` and use more i3-like marksLibravatar Calvin Lee2017-04-07
|/ / / | | | | | | | | | | | | | | | | | | | | | In i3 every mark is unique and one mark cannot be used in more than one window, sway behavior has been amended to match this. `swaymsg -t get_marks` will now return an array of all marks used in sway. See #98
* | | Merge pull request #1153 from SirCmpwn/fix-1152Libravatar Drew DeVault2017-04-07
|\ \ \ | |/ / |/| | Fix dangling file descriptors (fixes #1152)
| * | Merge pull request #1154 from ascent12/fix-1152Libravatar Drew DeVault2017-04-07
| |\ \ | | | | | | | | Removed explicitly setting file descriptors to -1
| | * | Removed explicitly setting file descriptors to -1Libravatar Scott Anderson2017-04-08
| |/ /
| * / Fix dangling file descriptors (fixes #1152)Libravatar Drew DeVault2017-04-07
|/ /
* | Merge pull request #1151 from ascent12/masterLibravatar Drew DeVault2017-04-06
|\ \ | | | | | | Change regex to use PCRE
| * | Added designated initaliser, to prevent any possible problem withLibravatar Scott Anderson2017-04-07
| | | | | | | | | | | | ordering
| * | Changed regular expressions to use PCRE for i3 compatibilityLibravatar Scott Anderson2017-04-07
|/ /
* | Merge pull request #1149 from 4e554c4c/criteriaLibravatar Drew DeVault2017-04-06
|\ \ | | | | | | Improve criteria handling
| * | Improve criteria handlingLibravatar Calvin Lee2017-04-05
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes how commands decide what container to act on. Commands get the current container though `current_container`, a global defined in sway/commands.c. If a criteria is given before a command, then the following command will be run once for every container the criteria matches with a reference to the matching container in 'current_container'. Commands should use this instead of `get_focused_container()` from now on. This commit also fixes a few (minor) mistakes made in implementing marks such as non-escaped arrows in sway(5) and calling the "mark" command "floating" by accident. It also cleans up `criteria.c` in a few places.
* | Merge pull request #1145 from 4e554c4c/marksLibravatar Drew DeVault2017-04-03
|\ \ | | | | | | Impliment i3-style marks
| * | Impliment i3-style marksLibravatar Calvin Lee2017-04-03
|/ / | | | | | | | | | | | | | | This commit adds three commands to sway: `show_marks`, `mark` and `unmark`. Marks are displayed right-aligned in the window border as i3 does. Marks may be found using criteria. Fixes #1007
* | Update man pageLibravatar Drew DeVault2017-04-03
| |
| * Add pretty printing to swaymsgLibravatar Drew DeVault2017-04-03
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If stdout is a tty, it will pretty print unless -r (--raw) is given. Sample outputs: ``` ~/s/s/build > ./bin/swaymsg fullscreen toggle Error: Permission denied for fullscreen toggle via IPC ~/s/s/build > ./bin/swaymsg -t get_workspaces Workspace 3:三 Output: DVI-I-1 Layout: splith Workspace 1:一 (off-screen) Output: HDMI-A-1 Layout: splith Workspace 5:五 (focused) Output: HDMI-A-1 Layout: splith ~/s/s/build > ./bin/swaymsg -t get_inputs Input device Metadot - Das Keyboard Das Keyboard Type: Keyboard Sway ID: 9456:320:Metadot_-_Das_Keyboard_Das_Keyb Input device Wacom Intuos S 2 Pen Type: Tablet tool Sway ID: 1386:827:Wacom_Intuos_S_2 Input device Wacom Intuos S 2 Pad Type: Tablet pad Sway ID: 1386:827:Wacom_Intuos_S_2 Input device Logitech Gaming Mouse G502 Type: Keyboard, Mouse Sway ID: 1133:49277:Logitech_Gaming_Mous ~/s/s/build > ./bin/swaymsg -t get_outputs Output DVI-I-1 Geometry: 1920x1080 @ 3840,0 Scale factor: 1x Workspace: 3:三 Output DVI-D-1 Geometry: 1920x1080 @ 0,0 Scale factor: 1x Workspace: 4:四 Output HDMI-A-1 Geometry: 1920x1080 @ 1920,0 Scale factor: 1x Workspace: 5:五 ```
* Update README.mdLibravatar Drew DeVault2017-03-28
|