aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorLines
2018-09-22Merge pull request #2660 from RyanDwyer/fix-scratchpad-iterationemersion-3/+3
Fix double iteration of scratchpad containers
2018-09-22Merge pull request #2687 from ianyfan/swaybarRyan Dwyer-3/+7
swaybar: explicitly check return value of getdelim
2018-09-22swaybar: explicitly check return value of getdelimIan Fan-3/+7
This prevents an signed-to-unsigned conversion error on buffer_index if getdelim fails and returns -1, which caused swaybar to try to search the header for the array and immediately failing
2018-09-22Merge pull request #2679 from RyanDwyer/fix-pango-escapingemersion-53/+23
Fix pango escaping and refactor escape_markup_text
2018-09-22Use pango_layout_set_text instead of pango_layout_set_markupRyan Dwyer-2/+4
2018-09-22Fix pango escaping and refactor escape_markup_textRyan Dwyer-56/+24
Fixes #2674. The cause of the issue was in get_pango_layout. When we call pango_parse_markup, `text` is the escaped string, and the unescaped string is then computed and written to `buf`. We were then passing the unescaped string to pango_layout_set_markup, but this function needs the escaped string. `buf` is not needed and has been removed. The other part of this PR refactors escape_markup_text to remove the dest_length argument and removes the -1 return value on error. It now assumes that you've allocated dest to the correct length.
2018-09-22Merge pull request #2678 from RyanDwyer/reconfigure-on-repositionemersion-0/+11
Reconfigure xwayland views when repositioned
2018-09-21Merge pull request #2666 from emersion/swaybar-hotplugBrian Ashworth-68/+82
swaybar: handle hotplugging
2018-09-21Merge branch 'master' into swaybar-hotplugBrian Ashworth-13/+33
2018-09-21Merge pull request #2672 from ianyfan/swaybarDrew DeVault-3/+14
swaybar: fix parsing errors when json is sent in parts
2018-09-21Merge pull request #2683 from ammgws/patch-1Drew DeVault-1/+1
stabilityに関する注記を更新
2018-09-21stabilityに関する注記を更新Jason-1/+1
2018-09-21swaybar: log invalid i3bar jsonIan Fan-3/+12
2018-09-21swaybar: reset tokener if json is incompleteIan Fan-0/+1
If the tokener parses incomplete json, it sets its error value to json_tokener_continue. This means that extra json should be provided, but the code was providing the entire object again. In the interest of simplicity, the tokener is reset so that buffer_pos always points to the start of the current object.
2018-09-21swaybar: update buffer_pos when moving object to start of bufferIan Fan-0/+1
2018-09-21Reconfigure xwayland views when repositionedRyan Dwyer-0/+11
Fixes #2673.
2018-09-21Update stability notice in README1.0-alpha.6Drew DeVault-4/+4
2018-09-21Merge pull request #2680 from marienz/no-x11-backendemersion-1/+7
Fix compilation against wlroots without X11 backend
2018-09-21Fix compilation against wlroots without X11 backendMarien Zwart-1/+7
2018-09-21Merge pull request #2665 from emersion/render-output-segfaultRyan Dwyer-4/+7
Fix segfault in output_render
2018-09-21Merge branch 'master' into render-output-segfaultRyan Dwyer-214/+295
2018-09-20swaybar: don't wl_display_roundtrip on each frameemersion-2/+1
This was the source of numerous bugs, from hotplug events not being received to segfaults because wl_display_roundtrip was making the bar process unplug events while blocking in an iteration over all outputs.
2018-09-20swaybar: handle hotpluggingemersion-66/+81
Don't kill and respawn swaybars on hotplug.
2018-09-20Merge pull request #2671 from emersion/output-execute-no-focusemersion-4/+9
Fix segfault when executing command without focus
2018-09-19Merge pull request #2676 from ianyfan/ipcDrew DeVault-0/+5
ipc: add pid information for views in layout tree
2018-09-19ipc: add pid information for views in layout treeIan Fan-0/+5
2018-09-19Fix segfault when executing command without focusemersion-4/+9
2018-09-19Merge pull request #2669 from RyanDwyer/create-output-commandDrew DeVault-0/+42
Introduce create_output command (for developer use)
2018-09-19Merge branch 'master' into create-output-commandemersion-0/+7
2018-09-19Merge pull request #2670 from ianyfan/commandsDrew DeVault-0/+7
config: free strings fields when freeing input config
2018-09-19config: free strings fields when freeing input configIan Fan-0/+7
2018-09-19Introduce create_output command (for developer use)Ryan Dwyer-0/+42
Should help with testing hotplugging.
2018-09-19Fix segfault in output_renderemersion-4/+7
2018-09-18Merge pull request #2640 from ianyfan/swaybarDrew DeVault-210/+232
Overhaul swaybar protocol handling (+fixes)
2018-09-18swaybar: only free tokener when using i3bar protocolIan Fan-1/+1
2018-09-18swaybar: add debugging statements for handling i3bar jsonIan Fan-0/+16
2018-09-18Fix double iteration of scratchpad containersRyan Dwyer-3/+3
root_for_each_container and root_find_container were using incorrect logic to determine if a container was hidden in the scratchpad. Containers will have a NULL parent if they are a direct child of a workspace. Containers will have a NULL workspace if they are hidden in the scratchpad. The incorrect check meant that root_for_each_container would run the callback on scratchpad containers twice. This meant that executing a command such as `[class="$something"] scratchpad show` would cause the command to run twice, resulting in the container being shown and hidden again which is effectively a no op. Fixes #2655.
2018-09-18swaybar: rewrite i3bar protocol handlingIan Fan-118/+128
This now correctly handles an incoming json infinite array by shifting most of the heavy listing to the json-c parser, as well as sending multiple statuses at once. It also removes the struct i3bar_protocol_state and moves its members into the status_line struct, allowing the same buffer to be used for both protocols.
2018-09-18swaybar: rewrite protocol determinationIan Fan-56/+33
This now uses the getline function to receive the header, replacing read_line_buffer, which has been deleted since it is otherwise unused. Furthermore, once the protocol has been determined, the current status is handled immediately to be shown (though this has not been added for the i3bar protocol since it has not yet been rewritten to handle this).
2018-09-18swaybar: rewrite text protocol handlingIan Fan-22/+26
This now uses getline to correctly handle multiple or long statuses. It also removes the struct text_protocol_state and moves its members into the status_line struct.
2018-09-18swaybar: only create i3bar block hotspot if click events are enabledIan Fan-13/+15
2018-09-18swaybar: send trailing comma with click event jsonIan Fan-1/+1
2018-09-18swaybar: fix empty function prototypesIan Fan-4/+4
2018-09-18swaybar: invalidate file descriptors upon closingIan Fan-4/+15
2018-09-18swaybar: remove block links upon exitIan Fan-1/+3
2018-09-17Merge pull request #2652 from emersion/swaybar-output-namesBrian Ashworth-30/+78
swaybar: use output names instead of output indexes
2018-09-17swaybar: use output names instead of output indexesemersion-30/+78
2018-09-17Merge pull request #2649 from wmww/fix-move-crashemersion-1/+1
Fix crash moving out of tab container
2018-09-17Fix crash moving out of tab containerWilliam Wold-1/+1
2018-09-16Merge pull request #2637 from RyanDwyer/fix-tabbed-workspace-shenanigansDrew DeVault-17/+26
Make seat_get_active_child ignore floating children