mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-22 05:32:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,556 Commits 11 Branches 91 Tags 48 MiB
b41097c085
Commit Graph

256 Commits

Author SHA1 Message Date
Drew DeVault
44d0f731c3 Add framework for switching command sets 
This will allow the bar {} block to have a different command set (and
also bar { colors { } }.
 2015-11-29 17:20:27 -05:00
Drew DeVault
4f89735fc4 Add bar config struct and defaults 2015-11-29 17:05:04 -05:00
Christoph Gysin
b1bd3ae6f3 cmd_output: Merge instead of replace output config 2015-11-29 23:17:56 +02:00
Christoph Gysin
ae7ed79573 config: Store 'enabled' as int 2015-11-29 23:17:55 +02:00
Drew DeVault
82d464bb90 Add text rendering support to wayland clients 2015-11-29 15:27:28 -05:00
Drew DeVault
e59cffcea2 Support desktop shell panels in compositor 2015-11-29 12:03:13 -05:00
Drew DeVault
4c1fad95b9 Remove trailing semicolon 2015-11-29 09:07:50 -05:00
Christoph Gysin
7d82cd9c0a cmd_output: Use list_seq_find() to find matching config 2015-11-29 15:29:06 +02:00
Drew DeVault
e0cb8284fb Rearrange logging headers 
Ref #270
 2015-11-28 08:49:02 -05:00
S. Christoffer Eliesen
2d0f78c0d6 workspace: Learn sticky. 
A floating window that's sticky will move to the new active workspace
whenever the workspace on the same output changes.
 2015-11-27 17:58:10 +01:00
Drew DeVault
062c74b7d0 Add command line to swaygrab 
Also modifies IPC client so that we can work with persistent
connections.
 2015-11-27 10:10:29 -05:00
Drew DeVault
27f03c705d Move IPC client into common, refactor IPC 2015-11-27 09:50:04 -05:00
S. Christoffer Eliesen
a06cb7cd01 criteria: Add. Learn for_window command. 
A criteria is a string in the form of `[class="regex.*" title="str"]`.
It is stored in a struct with a list of *tokens* which is a
attribute/value pair (stored as a `crit_token` struct). Most tokens will
also have a precompiled regex stored that will be used during criteria
matching.

for_window command: When a new view is created its metadata is tested
against all stored criteria, and if a match is found the associated
command list is executed.

Unfortunately some metadata is not available in sway at the moment
(specifically `instance`, `window_role` and `urgent`). Any criteria
string that tries to match an unsupported attribute will fail.

(Note that while the criteria code can be used to parse any criteria
string it is currently only used by the `for_window` command.)
 2015-11-25 14:34:33 +01:00
S. Christoffer Eliesen
4367e6d3e3 container: Store app_id attribute for views. 2015-11-24 16:00:41 +01:00
S. Christoffer Eliesen
47c313fe3e container: Store class attribute for views. 2015-11-24 16:00:41 +01:00
S. Christoffer Eliesen
a0c5a0bb30 cmd_bindsym: Detect/handle duplicates. 
Also replace `bindsym_sort` with function `sway_binding_cmp` that takes
all data into account when comparing.
 2015-11-22 21:17:36 +01:00
S. Christoffer Eliesen
5531dbe1b2 cmd_workspace: Don't fill up config->workspace_outputs with duplicates. 
This also fixes a bug where issuing a new "workspace a output b" command
for an already assigned workspace would not work (the old config would
be found first and used instead).
 2015-11-22 11:08:08 +01:00
S. Christoffer Eliesen
d0af224e6d stringop: lenient_strcmp: Add. 2015-11-21 22:22:09 +01:00
S. Christoffer Eliesen
a33e3badad list: Add list_seq_find. 
Sometimes one has to traverse a list to find out if some data already
exists there in order to avoid dupilcates in the list, and this function
facilitates in that without requiring that the data is ordered.
 2015-11-21 22:22:08 +01:00
Drew DeVault
79b277fe9b Parse output background config 2015-11-19 18:25:15 -05:00
Drew DeVault
b4e5e1381f Refactor the crap out of wayland clients 
And create a background surface on every output when invoking swaybg.
 2015-11-19 07:58:57 -05:00
Drew DeVault
4a1584be53 Fix background extensions 
Thanks @Cloudef, it works great
 2015-11-19 07:23:11 -05:00
Drew DeVault
65b8a5c3ce Add background handling 
This does not work as expected. I think the problem is on the wlc side.
Please review, @Cloudef. To reproduce the issues:

1. Run sway
2. Open terminal in sway
3. Run swaybg

swaybg will create a surface and ask to have it set as the background,
but wlc_handle_from_wl_surface_resource will return 0. If the swaybg
surface is a shell surface, then it works - but wlc complains about the
pointer type and segfaults as soon as the pre-render hook tries to draw
the background.
 2015-11-18 22:14:57 -05:00
Drew DeVault
82db2a57a9 Basic support for extensions in server and clients 2015-11-18 22:01:22 -05:00
Drew DeVault
7a40eb6de6 Support cursors over wayland clients 
Apparently wayland has fucking client-side cursors, too
 2015-11-18 19:38:42 -05:00
Drew DeVault
86372d00db Fix SIGBUS from wayland clients 2015-11-18 09:55:55 -05:00
Drew DeVault
665d4baaf1 Normalize indentation 2015-11-18 08:44:08 -05:00
Drew DeVault
9a1e95b7da Clean up memory pool files better 2015-11-18 08:36:08 -05:00
Drew DeVault
399220f14b Fix up wayland client implementation 
Now it receives frame callbacks and renders properly, and is double
buffered and such.
 2015-11-18 08:22:53 -05:00
S. Christoffer Eliesen
236f26f62e output: Support multiple adjacent outputs. 
When querying for an adjacent output we now need an absolute position in
order to know which adjacent output that matches. (The position is
either the current mouse position or the center of the currently focused
container, depending on context.)

If two outputs have one edge each that at least partially align with
each other they now count as adjacent.

Seamless mouse is affected by this and now properly moves and positions
itself between outputs with "uneven" placement (as long as they have at
least some part of the edge adjacent to each other).

When focusing or moving a container in a specified direction the center
of the current focused container decides where to look for an adjacent
output. So if e.g. an output has two adjacent outputs to the right and a
"focus right" command is issued then it's the placement of the currently
focused container that decides which output actually gets focused.

Also, if an output has at least one output adjacent in some direction
but the entire edge is not covered (ie. it has "holes" with no outputs),
then the algorithm will choose the output that is closest to the
currently focused container (this does not apply to seamless mouse, the
pointer will just stop at the edge in that case).
 2015-11-16 21:32:18 +01:00
S. Christoffer Eliesen
a94a91a723 cmd_output: Replace existing config if called multiple times. 2015-11-16 15:57:42 +01:00
Drew DeVault
c43ef2aedd We don't need to implement strdup 
After defining _GNU_SOURCE
 2015-11-12 19:43:03 -05:00
Drew DeVault
11b1ba397f Further refinement of wayland client support 2015-11-12 19:35:39 -05:00
Drew DeVault
bfcabe48ef Start fleshing out wayland client implementation 
This introduces a basic shared framework for making wayland clients
within sway itself.
 2015-11-12 19:04:01 -05:00
Drew DeVault
ef8335d694 Start working on IPC for get_pixels 
This is broken
 2015-11-12 12:37:23 -05:00
Drew DeVault
d729032ba2 Add file and line number to log in Debug build 2015-11-11 08:32:32 -05:00
Drew DeVault
edb3e4b5ab Add some documentation comments 
This is mostly setting a precedent, I hope that others will continue to
write docs for more headers.

Ref #218
 2015-11-08 12:06:51 -05:00
S. Christoffer Eliesen
abc5fbfaec Learn "gaps edge_gaps <on|off|toggle>". 
When yes, the old behaviour of adding half the inner gap around each
view is used.

When no, don't add any gap when an edge of the view aligns with the
workspace. The result is inner gap only between views, not against the
workspace edge.

The algorithm is not perfect because it means the extra space is
distributed amongst edge-aligned views only, but it's simple, looks good
and it works.
 2015-11-04 13:21:10 +01:00
S. Christoffer Eliesen
af31a3f04a commands: Learn 'move workspace to output <direction|name>'. 2015-11-03 22:38:53 +01:00
S. Christoffer Eliesen
515ed86f4d container.h: Remove unused. 2015-10-29 19:13:52 +01:00
S. Christoffer Eliesen
5ba47d4a44 input_state: Remove mouse_origin (x&y). Query wlc instead. 2015-10-29 18:02:02 +01:00
S. Christoffer Eliesen
78ca619769 commands: Learn mouse_warping. 
Place mouse at center of focused view when changing to a workspace on a
different output, if option is enabled. (This replicates existing i3
option.)

This can be triggered in multiple ways:
A) via `workspace <name>` which changes output
B) via `focus <direction>` which changes output
C) via `focus output <name>` which (obviously) changes output
 2015-10-29 17:41:33 +01:00
S. Christoffer Eliesen
4799d07ac1 input_state: Extract 'pointer_position_set' function from handlers. 2015-10-29 16:37:19 +01:00
S. Christoffer Eliesen
865b30f138 container: Move container_under_pointer here from handlers. 2015-10-29 16:37:19 +01:00
Drew DeVault
6cd106d23c Merge pull request #208 from minus7/ipc_subscribe 
implemented IPC subscribe for workspace event
 2015-10-27 17:19:18 -04:00
minus
9925554ea4 implemented IPC subscribe for workspace event 2015-10-27 21:59:17 +01:00
S. Christoffer Eliesen
9f02b0bf16 commands: Learn 'debuglog'. 
Replicates i3 option. Verbosity level given as command line argument
becomes default log level, and using 'debuglog toggle' switches back and
forth between default and debug (or L_ERROR and debug if default is also
L_DEBUG).
 2015-10-27 14:37:44 +01:00
S. Christoffer Eliesen
5a70853253 log: Add swayc_log, use at a few key places. 
swayc_log works just like sway_log, but appends type and name from given
container to the log output.
 2015-10-25 13:14:28 +01:00
S. Christoffer Eliesen
c6bb23b7dd sway/output: Create, move code from handlers.c here. 2015-10-25 13:14:23 +01:00
S. Christoffer Eliesen
c1479701de seamless_mouse: Move pointer only if successfully changed workspace. 
If e.g. a window has a popup open then that will lock the current focus,
making a workspace switch denied.

So don't move the mouse pointer in such cases.
 2015-10-23 16:35:48 +02:00
S. Christoffer Eliesen
362413bd50 commands: cmd_results->input is duplicated/freed. 2015-10-23 13:03:14 +02:00
S. Christoffer Eliesen
af30a1b67c ipc,commands,config: Replace cmd_status enum with cmd_results struct. 
In i3 the ipc reply will contain a human readable error message, and
this patch replicates that behaviour.

However, that error message is also useful for logging, which this
patch takes advantage of.

E.g. instead of logging errors directly in commands.c/checkargs, it is
fed back to the caller which eventually ends up logging everything with
maximum context available (config.c/read_config).

So instead of logging e.g. "Error on line 'exit'" it will now log:
"Error on line 'exit': Can't execute from config."
 2015-10-22 23:36:24 +02:00
S. Christoffer Eliesen
edf33aad29 config: Add "seamless_mouse" to decide if pointer crosses output edges. 2015-10-22 01:39:12 +02:00
S. Christoffer Eliesen
ca862a5bd4 config: Apply output config also during config reload. 2015-10-21 23:24:06 +02:00
S. Christoffer Eliesen
3be11a08e6 main: Implement --get-socketpath switch. 2015-10-18 19:53:56 +02:00
taiyu
0d51f62224 merge + no c_extensions 2015-09-18 07:23:04 -07:00
Drew DeVault
318e1be240 Fix warnings introduced by prior commit 2015-09-18 07:27:35 -04:00
taiyu
0bea2e2122 multi command keybinds 2015-09-14 19:59:25 -07:00
Drew DeVault
e505abfe75 Revert "new_workspace null behavior + testmap functions + regex" 
This reverts commit e1d18e42a8.

Fixes #180

cc @taiyu-len
 2015-09-13 19:46:16 -04:00
taiyu
f76f9e2eea visible values 2015-09-12 02:52:18 -07:00
taiyu
e1d18e42a8 new_workspace null behavior + testmap functions + regex 2015-09-12 02:38:03 -07:00
taiyu
aaa0923bc4 cmd status + workspace ws output op 2015-09-10 11:07:40 -07:00
taiyu
6388241abb mode supports multi token names 2015-09-08 10:53:15 -07:00
taiyu
aa22dc3113 var replacement changes 2015-09-08 10:27:09 -07:00
taiyu
d673a72705 set variable changes 2015-09-08 08:54:57 -07:00
taiyu
71af5b7dde config modes 2015-09-07 14:29:40 -07:00
taiyu
f25c6b312b gap resize 2015-09-05 20:48:52 -07:00
taiyu
2ef83664f5 remove outdated comment 2015-09-04 17:10:10 -07:00
taiyu
afa6747145 enum for command type 2015-09-04 17:09:07 -07:00
taiyu
4cd18449d2 better handling of commands during config 2015-09-04 16:57:03 -07:00
taiyu
dbeca88dee default gap value 2015-09-04 16:14:59 -07:00
Luminarys
12e96f0f9e Added in workspace_auto_back_and_forth 2015-08-30 21:34:24 -05:00
Luminarys
fe2ec8a676 Added in workspace back_and_forth 2015-08-30 19:59:14 -05:00
Luminarys
28e937020a Made scratchpad handling identical to i3 2015-08-29 21:14:13 -05:00
Luminarys
7eefecf479 Added in scratchpad adding 2015-08-28 23:39:12 -05:00
taiyu
1820b3f0bb move function redone 2015-08-28 11:03:10 -07:00
taiyu
5678d824e4 update visibility + container info functions 2015-08-27 23:18:28 -07:00
taiyu
da79bd65de use previous outputs 2015-08-27 20:32:56 -07:00
Luminarys
acb3fbdfb5 Added in default_orientation handling 2015-08-27 21:52:59 -05:00
taiyu
357af228d6 some function documentation, fixed gaps on config reload 2015-08-26 13:35:22 -07:00
taiyu
1fa7a91bfb move_container_to fixup 2015-08-26 11:01:26 -07:00
taiyu
225c2fbe5b fixed segfault on exit + a little fixup of that floatfocus pr 2015-08-25 13:29:33 -07:00
minus
ca89ba83a8 changed view visibility to be bool 
view_visibility enum remains with one constant that is the mask to wlc's view masking
 2015-08-25 20:13:35 +02:00
minus
e533014201 added missing util.h/c stuff 2015-08-25 19:53:59 +02:00
minus
e854a54e96 changed workspace_{outout_,}{next,prev} to return workspace 
so it can be reused for "move container to workspace next"
 2015-08-25 19:00:20 +02:00
minus
03e4a97dbe added "move container to workspace" 
makes the previous commit actually testable
 2015-08-25 18:25:36 +02:00
minus
f22c937953 refactored view visibility 
- replace visibilty mask integers with an enum
- set output's visibilty mask on creation
- added update_visibility to manually update a containers visibility (e.g. when it moved to an invisible workspace)
 2015-08-25 18:24:15 +02:00
minus
1efda79bf2 refactored workspace_next/prev 2015-08-25 15:17:18 +02:00
Luminarys
7c5b6f8c52 Added in backtrace printing 2015-08-24 15:44:58 -05:00
taiyu
dbad30a409 add limit to swayc_in_direction 2015-08-24 01:11:21 -07:00
taiyu
c8415d7fef split_string memory leaks cleanedup 2015-08-23 19:09:18 -07:00
taiyu
51ab3c9180 merge 2015-08-23 12:34:18 -07:00
Drew DeVault
1ac0c8cd47 Refactor keyboard to consider modified keysyms 
Press Shift
Press 0       # Reads as ')'
Release Shift
Release 0     # Reads as '0' but we now recognize it as the same
 2015-08-23 15:28:49 -04:00
Luminarys
a65dca04e8 Style fix 2015-08-23 13:19:47 -05:00
Luminarys
98fad060e2 Added in glitchy disabling 2015-08-23 12:23:01 -05:00
taiyu
d72cc92541 style 2015-08-23 07:59:18 -07:00
taiyu
f24b78898a dont swap view with workspace... 2015-08-22 21:54:39 -07:00
taiyu
42d5d9a177 mouse tile resize mode done 2015-08-22 21:03:45 -07:00
taiyu
e139de0857 floating/tiling move + floating resize cleaned and fixed 2015-08-22 18:01:38 -07:00
Drew DeVault
b7f4607544 Implement output configuration through config 
Do not use `output res WIDTHxHEIGHT` yet, wlc has issues with it (cc
@Cloudef)
 2015-08-22 11:18:55 -04:00
Luminarys
f6b16ca089 Refactored resizing functions into resize.c 2015-08-21 22:26:11 -05:00
taiyu
5a67628ad9 Merge branch 'master' of https://github.com/SirCmpwn/sway 
merge
 2015-08-21 10:28:49 -07:00
taiyu
1a1ac64662 bugfixes, renames 2015-08-21 10:28:37 -07:00
Drew DeVault
1c38b7a8d2 Merge pull request #111 from Luminarys/master 
Added in proper resize locking
 2015-08-21 12:23:53 -04:00
Luminarys
a8eab5492a Added in proper resize locking 2015-08-21 11:19:06 -05:00
minus
8dfaf6265b fixed #108 signed/unsigned comparison 2015-08-21 16:53:11 +02:00
Luminarys
7ecb55f218 Minor style fix 2015-08-21 09:29:52 -05:00
Luminarys
97bd548456 More minor fixes 2015-08-21 09:26:22 -05:00
Luminarys
de86c5f4ea Cleanup and minor fixes 2015-08-21 09:24:26 -05:00
Drew DeVault
a436fc17ff Merge pull request #105 from Half-Shot/master 
Basic 'move' functionality.
 2015-08-21 07:24:17 -04:00
Drew DeVault
464b49eda2 Merge pull request #101 from Luminarys/master 
Added in basic resizing command.
 2015-08-21 07:12:05 -04:00
Luminarys
96ab21b276 Fixes to resizing and added in resize lock once boundaries are exceeded 2015-08-21 00:49:47 -05:00
Luminarys
461da7f87f Added in bspwm like mouse resizing 2015-08-21 00:17:26 -05:00
Luminarys
f589731f29 Rewrite of resize command to make it more sane 2015-08-20 21:37:59 -05:00
Drew DeVault
3a5fce339f Reset key buffer on reload 
To preserve my sanity
 2015-08-20 17:14:46 -04:00
Half-Shot
713bf29ec9 Few stray bits 2015-08-20 21:45:00 +01:00
Half-Shot
5a9ba261bc Merge branch 'master' of https://github.com/SirCmpwn/sway 2015-08-20 21:32:08 +01:00
Half-Shot
2a62c5c7fb Basic left right move command implemented. 2015-08-20 21:29:40 +01:00
minus
754793aad4 added IPC messages get_workspaces and get_outputs 
No escaping on container names is done yet, as well as some values are
hardcoded because they don't exist yet.
 2015-08-20 21:13:01 +02:00
taiyu
36e07e9ebc find_parent_by_type 2015-08-20 09:52:54 -07:00
Luminarys
bc3babf566 Added in basic resize command 2015-08-20 11:30:32 -05:00
Luminarys
15d9f1edcb Added in basic resize command 2015-08-20 11:30:11 -05:00
minus
f8787ce69e added missing header file 2015-08-20 15:27:59 +02:00
minus
f26ed32e46 added sway_terminate to exit cleanly 2015-08-20 15:27:56 +02:00
minus
91c0877264 properly exit sway 
- wlc_terminate() instead of exit(0)
- unlink IPC socket
 2015-08-20 15:24:33 +02:00
minus
773e85c681 properly handle IPC clients 2015-08-20 15:24:33 +02:00
minus
5d99215469 added i3-ipc support/parsing 2015-08-20 15:24:33 +02:00
minus
8981b48cd2 very basic IPC implementation 
simply executes the received data as command
 2015-08-20 15:24:33 +02:00
Drew DeVault
579fe70ed9 Add command line parsing 
Closes #6
 2015-08-20 08:37:24 -04:00
taiyu
f5fde7c45c style 2015-08-20 05:06:22 -07:00
taiyu
fbaa9111a8 setup for resizable windows, drop weight 2015-08-20 04:47:36 -07:00
taiyu
5ff0619ca1 input state, find_container_in_direction 2015-08-19 20:22:15 -07:00
taiyu
470b4dfbae key_state.ch, and command conflicts resolved 2015-08-19 18:59:27 -07:00
taiyu
c5a6982893 fixed some more bugs, moved layout_log into log.ch, restored focus_parent 2015-08-19 01:06:15 -07:00
taiyu
e16a4015ff fixed focus key handler 2015-08-19 00:28:53 -07:00
Luminarys
3c430688a8 header update 2015-08-18 21:06:41 -05:00
KoffeinFlummi
c75d5ceba4 Merge remote-tracking branch 'upstream/master' into gaps 2015-08-19 00:05:18 +02:00
KoffeinFlummi
4c688cba4e Add support for gaps option 2015-08-18 23:53:57 +02:00
minus
faccaf6112 added sway_assert function 
returns false on a failed assertion in release mode and raises SIGABRT in debug mode
 2015-08-18 23:38:34 +02:00
Drew DeVault
85a573dab7 Revert "enhanced whitespace remover" 
This reverts commit abd0afb03a.
 2015-08-18 08:39:26 -04:00
Drew DeVault
2139001c9f Coding style enforcement 
This was done by hand, so I might have missed things. If anyone knows of
a good C style enforcement tool, let me know.
 2015-08-18 07:20:34 -04:00
Drew DeVault
2f6dd0687b Merge pull request #65 from taiyu-len/focus_v2 
Focus v2
 2015-08-18 07:02:31 -04:00
taiyu
b132f67e7b minor fixes 2015-08-18 03:48:41 -07:00
taiyu
abd0afb03a enhanced whitespace remover 2015-08-18 03:22:31 -07:00
taiyu
63bc0d3b54 more changes 2015-08-18 02:46:14 -07:00
taiyu
4606fb1ee3 merged Luminarys resizing code 2015-08-18 01:07:12 -07:00
taiyu
11321ca2dd changed handling of focus, handling of view by type 2015-08-18 00:28:44 -07:00
Luminarys
e541ba3d87 Added in basic, but semi-broken moving/resizing functionality to floating windows 2015-08-18 01:33:15 -05:00
Drew DeVault
780893a933 Add support for workspace [name] output [name] 2015-08-17 20:34:53 -04:00
Luminarys
c9ce8bf1bd Style and other minor fixes 2015-08-17 10:34:39 -05:00