summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* 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
|
* Mention cap_sys_tty_config in readmeLibravatar Drew DeVault2017-03-27
|
* Merge pull request #1130 from oranenj/fix_move_next_crashLibravatar Drew DeVault2017-03-19
|\ | | | | Fix move next crash
| * Prevent "move next" and "move prev" commands from crashingLibravatar Jarkko Oranen2017-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1120 When the parent of a view is C_WORKSPACE and the movement direction is either MOVE_PREV or MOVE_NEXT, the code would attempt to move the views to the next output, but swayc_adjacent_output can't accept non-directional movement commands and causes undefined behaviour and a segfault. If the code is simply skipped, we end up in an infinite loop. Instead, we can allow containers whose parent is a C_WORKSPACE take the path that handles MOVE_PREV and MOVE_NEXT, which behaves as you would expect. I'm not certain that this fix is entirely correct as the desired behaviour of move_container is not very well defined, but it seems to work.
| * The default layout of a workspace should follow the outputLibravatar Jarkko Oranen2017-03-19
|/ | | | | | Hardcoding it to L_HORIZ does not make sense to me, as you get the unexpected behaviour that windows will be arranged horizontally until you switch the layout.
* Merge pull request #1126 from zandrmartin/prevent-fullscreen-focus-stealingLibravatar Drew DeVault2017-03-18
|\ | | | | prevent fullscreen focus thievery
| * prevent fullscreen focus thieveryLibravatar Zandr Martin2017-03-18
|/ | | | I believe this fixes #1102
* Merge pull request #1125 from zandrmartin/remove-unnecessary-todoLibravatar Drew DeVault2017-03-18
|\ | | | | remove unnecessary todo item
| * Merge branch 'master' into remove-unnecessary-todoLibravatar Drew DeVault2017-03-18
| |\ | |/ |/|
* | Merge pull request #1124 from zandrmartin/correct-typoLibravatar Drew DeVault2017-03-18
|\ \ | | | | | | wl_poitner -> wl_pointer
| * | wl_poitner -> wl_pointerLibravatar Zandr Martin2017-03-18
|/ /
| * remove unnecessary todo itemLibravatar Zandr Martin2017-03-18
|/ | | | | | As best I can tell this todo was intended to add workspace movement to the given output with the `workspace <ws> output <op>` command, but i3 does not behave this way.
* Merge pull request #1119 from oranenj/masterLibravatar Drew DeVault2017-03-18
|\ | | | | Fix off-by-one error when checking workspace_layout arguments
| * Merge branch 'master' into masterLibravatar Drew DeVault2017-03-18
| |\ | |/ |/|
* | Merge pull request #1121 from zandrmartin/registry-keyboard-capsLibravatar Drew DeVault2017-03-18
|\ \ | | | | | | add missing ! for wl seat keyboard caps
| * | add missing ! for wl seat capsLibravatar Zandr Martin2017-03-18
|/ /
| * Fix off-by-one error when checking workspace_layout argumentsLibravatar Jarkko Oranen2017-03-18
|/
* Merge pull request #1117 from jnsaff/masterLibravatar Drew DeVault2017-03-16
|\ | | | | Allow also 444 for security file mode
| * Allow also 444 for security file modeLibravatar Jaanus Torp2017-03-16
|/
* Merge pull request #1115 from snoack/missing-includesLibravatar Drew DeVault2017-03-14
|\ | | | | Superfluous include causes failures if WLC headers aren't installed globally
| * Removed superfluous include, causing failures if WLC headers aren't ↵Libravatar Sebastian Noack2017-03-14
|/ | | | installed globally
* Merge pull request #1108 from zandrmartin/new-command-aliasesLibravatar Drew DeVault2017-03-13
|\ | | | | deprecate new_window and new_float commands
| * Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliasesLibravatar Zandr Martin2017-03-13
| |\ | |/ |/|
* | Merge pull request #1113 from johnchen902/patch-1Libravatar Drew DeVault2017-03-12
|\ \ | | | | | | Fix trivial typo in sway.5.txt (right_ -> _right_)
| * | Fix trivial typo in sway.5.txt (right_ -> _right_)Libravatar John Chen2017-03-13
|/ / | | | | as title