pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b8a7b6a605
polybar-dwm/include/components/bar.hpp

114 lines
3.1 KiB
C++
Raw Normal View History

refactor: Application rewrite
2016-06-15 03:32:35 +00:00
#pragma once
New Tag Parser (#2303) * refactor(color): Use enum class for color type * Add testcases for tag parser * Make tag parser a pull-style parser Being able to parse single elements at a time gives us more fine-grained error messages, we can also parse as much as possible and only stop after an exception. * fix(color): Parser did not check for invalid chars * tag parser: First full implementation * tag parser: Fix remaining failing tests * tag parser: Replace old parser * tag parser: Treat alignment as formatting tag Makes the structure less complex and the alignment tags really are formatting tags, they are structurally no different from the %{R} tag. * tag parser: Cleanup type definitions All type definitions for tags now live in tags/types.hpp, the parser.hpp only contains the definitions necessary for actually calling the parser, this shouldn't be included in many places (only places that actually do parsing). But many places need the definitions for the tags themselves. * Rename components/parser to tags/dispatch * tag parser: Cleanup * Add changelog
2020-12-17 19:37:28 +00:00
#include <cstdlib>
refactor: Move all event handling to the controller
2016-12-20 04:05:43 +00:00
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
#include "common.hpp"
Integrate bar taskqueue into eventloop (#2510) * Remove DEBUG_SHADED Was disabled by default AND behind an #if 0 * Make TimerHandle expose more libuv functions * Prepare for moving double clicks into eventloop * Make eventloop available to bar * Remove bar mutex Everything in the bar is now in the same thread * Move double-click handling to eventloop * Extract double click deferred function into method * Stop throttling clicks * Increase double click interval to 400 and add option double-click-interval in the bar section Closes #1441 * Implement dimming using timer handles * Remove taskqueue * Remove unused dependencies * Cleanup & Comments
2021-09-27 15:35:45 +00:00
#include "components/eventloop.hpp"
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
#include "components/types.hpp"
refactor(clang-tidy): Apply fixes
2016-11-25 12:55:15 +00:00
#include "errors.hpp"
wip(refactor): Improve signal and event handling
2016-12-05 19:41:00 +00:00
#include "events/signal_fwd.hpp"
wip: Window autohide
2016-12-21 03:50:43 +00:00
#include "events/signal_receiver.hpp"
wip(refactor): Cairo drawing
2017-01-19 04:38:42 +00:00
#include "settings.hpp"
Move action_context into separate file
2021-02-03 18:29:09 +00:00
#include "tags/action_context.hpp"
New Tag Parser (#2303) * refactor(color): Use enum class for color type * Add testcases for tag parser * Make tag parser a pull-style parser Being able to parse single elements at a time gives us more fine-grained error messages, we can also parse as much as possible and only stop after an exception. * fix(color): Parser did not check for invalid chars * tag parser: First full implementation * tag parser: Fix remaining failing tests * tag parser: Replace old parser * tag parser: Treat alignment as formatting tag Makes the structure less complex and the alignment tags really are formatting tags, they are structurally no different from the %{R} tag. * tag parser: Cleanup type definitions All type definitions for tags now live in tags/types.hpp, the parser.hpp only contains the definitions necessary for actually calling the parser, this shouldn't be included in many places (only places that actually do parsing). But many places need the definitions for the tags themselves. * Rename components/parser to tags/dispatch * tag parser: Cleanup * Add changelog
2020-12-17 19:37:28 +00:00
#include "utils/math.hpp"
wip: Separate source from definitions
2016-11-02 19:22:45 +00:00
#include "x11/types.hpp"
#include "x11/window.hpp"
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
fix: project rename
2016-11-19 05:22:44 +00:00
POLYBAR_NS
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
refactor(signals): Use full namespace
2017-01-12 15:34:14 +00:00
// fwd {{{
refactor(x11): Cleanup
2016-12-21 13:55:19 +00:00
class config;
refactor: Move all event handling to the controller
2016-12-20 04:05:43 +00:00
class connection;
class logger;
class renderer;
feat: Reload on XCB_RANDR_SCREEN_CHANGE_NOTIFY
2016-11-26 23:46:41 +00:00
class screen;
refactor: Cleanup
2016-11-13 20:50:21 +00:00
class tray_manager;
New Tag Parser (#2303) * refactor(color): Use enum class for color type * Add testcases for tag parser * Make tag parser a pull-style parser Being able to parse single elements at a time gives us more fine-grained error messages, we can also parse as much as possible and only stop after an exception. * fix(color): Parser did not check for invalid chars * tag parser: First full implementation * tag parser: Fix remaining failing tests * tag parser: Replace old parser * tag parser: Treat alignment as formatting tag Makes the structure less complex and the alignment tags really are formatting tags, they are structurally no different from the %{R} tag. * tag parser: Cleanup type definitions All type definitions for tags now live in tags/types.hpp, the parser.hpp only contains the definitions necessary for actually calling the parser, this shouldn't be included in many places (only places that actually do parsing). But many places need the definitions for the tags themselves. * Rename components/parser to tags/dispatch * tag parser: Cleanup * Add changelog
2020-12-17 19:37:28 +00:00
namespace tags {
class dispatch;
}
refactor(signals): Use full namespace
2017-01-12 15:34:14 +00:00
// }}}
wip: Window autohide
2016-12-21 03:50:43 +00:00
refactor: Move all event handling to the controller
2016-12-20 04:05:43 +00:00
class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::property_notify, evt::enter_notify,
fix(render): support stacked bars We now take the bar position that the window manager gives us instead of trying to calculate it ourselves. This is more correct when multiple bars are attached to the same edge, as the window manager may move some of them in that case (assuming override redirect is not enabled)
2017-08-31 16:26:38 +00:00
evt::leave_notify, evt::motion_notify, evt::destroy_notify, evt::client_message, evt::configure_notify>,
fix mouseover error when only one cursor is defined If only cursor-click or cursor-scroll is defined, but not the other, the bar could try to set the cursor to the empty string which resulted in an error.
2022-03-20 18:09:45 +00:00
public signal_receiver<SIGN_PRIORITY_BAR, signals::ui::dim_window> {
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
public:
refactor: Object construction
2016-12-09 08:40:46 +00:00
using make_type = unique_ptr<bar>;
Eventloop cleanup (#2577) * eventloop: Use eventloop namespace in cpp files * changelog: Add missing deprecated hook message * Make eventloop and ipc classes non-copyable and non-movable * Remove functional.hpp * eventloop: Don't close handles in error cases Client should be responsible for closing handles. * eventloop: Address invalidation of handle references
2022-01-22 21:00:26 +00:00
static make_type make(eventloop::loop&, bool only_initialize_values = false);
refactor: Construction methods
2016-12-09 08:02:47 +00:00
Eventloop cleanup (#2577) * eventloop: Use eventloop namespace in cpp files * changelog: Add missing deprecated hook message * Make eventloop and ipc classes non-copyable and non-movable * Remove functional.hpp * eventloop: Don't close handles in error cases Client should be responsible for closing handles. * eventloop: Address invalidation of handle references
2022-01-22 21:00:26 +00:00
explicit bar(connection&, signal_emitter&, const config&, const logger&, eventloop::loop&, unique_ptr<screen>&&,
Move most action state out of renderer The renderer now only stores the positions of the actions because that is specific to the renderer and because the actual position can only be finalized after all the rendering is done because intitially the positions are relative to the alignment and not the bar.
2021-01-10 19:49:50 +00:00
unique_ptr<tray_manager>&&, unique_ptr<tags::dispatch>&&, unique_ptr<tags::action_context>&&,
Integrate bar taskqueue into eventloop (#2510) * Remove DEBUG_SHADED Was disabled by default AND behind an #if 0 * Make TimerHandle expose more libuv functions * Prepare for moving double clicks into eventloop * Make eventloop available to bar * Remove bar mutex Everything in the bar is now in the same thread * Move double-click handling to eventloop * Extract double click deferred function into method * Stop throttling clicks * Increase double click interval to 400 and add option double-click-interval in the bar section Closes #1441 * Implement dimming using timer handles * Remove taskqueue * Remove unused dependencies * Cleanup & Comments
2021-09-27 15:35:45 +00:00
bool only_initialize_values);
refactor: Defer buttonpress using taskqueue
2016-12-20 12:03:46 +00:00
~bar();
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
fix(builder): ignored offsets The builder::offset function returned immediately if a valid extent was passed instead of when an invalid one was passed.
2022-03-14 21:11:46 +00:00
const bar_settings& settings() const;
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
Use uv timer for delayed screenshot
2021-09-11 13:14:17 +00:00
void start();
fix(tray): Force bar update on change Refs #295
2017-01-09 13:27:55 +00:00
void parse(string&& data, bool force = false);
refactor(config): Deduce return type from default value
2016-12-30 22:32:05 +00:00
feat(ipc): Add visibility commands
2017-04-21 16:15:18 +00:00
void hide();
void show();
void toggle();
refactor: Tray transparency and code cleaning - Make pseudo-transparency work as intended, fixes #158 - Fill tray pixmap in case a root pixmap is not found - Split up bar bootstrap routine - Formatting (clang-format)
2016-11-12 11:56:39 +00:00
protected:
void restack_window();
fix typos (#2524)
2021-10-04 21:46:38 +00:00
void reconfigure_window();
fix(bar): Configure window before remapping Some WMs like i3 discard position information when unmapping the bar and because of that the bar would be at the wrong position after being remapped. Fixes #1484 Ref: https://github.com/i3/i3/pull/3834
2019-10-15 22:30:10 +00:00
void reconfigure_geom();
fix: Reconfigure position after mapping Ref #212
2016-12-03 17:38:33 +00:00
void reconfigure_pos();
void reconfigure_struts();
void reconfigure_wm_hints();
fix(tray): Visibility change
2016-12-03 19:26:29 +00:00
void broadcast_visibility();
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
fix: Positioning in awesomeWM Since polybar sets WM_NORMAL_HINTS, awesomeWM for some reason no longer respect the position set by polybar before mapping. reconfiguring the window position once again after mapping the window, again positions it correctly.
2022-03-15 20:48:19 +00:00
void map_window();
Integrate bar taskqueue into eventloop (#2510) * Remove DEBUG_SHADED Was disabled by default AND behind an #if 0 * Make TimerHandle expose more libuv functions * Prepare for moving double clicks into eventloop * Make eventloop available to bar * Remove bar mutex Everything in the bar is now in the same thread * Move double-click handling to eventloop * Extract double click deferred function into method * Stop throttling clicks * Increase double click interval to 400 and add option double-click-interval in the bar section Closes #1441 * Implement dimming using timer handles * Remove taskqueue * Remove unused dependencies * Cleanup & Comments
2021-09-27 15:35:45 +00:00
void trigger_click(mousebtn btn, int pos);
Add compiler warning for missing override specifier (#2341) * build: Add -Wsuggest-override We should always use the override specifier when overriding virtual functions. This helps prevent errors when a subclass tries to create a function with the same name as a virtual function in a super-class but with a different purpose. * clang-format * Upload logs on failure * Add override to unsupported.hpp * cmake: Make -Wsuggest-override flag conditional
2021-01-04 09:38:43 +00:00
void handle(const evt::client_message& evt) override;
void handle(const evt::destroy_notify& evt) override;
void handle(const evt::enter_notify& evt) override;
void handle(const evt::leave_notify& evt) override;
void handle(const evt::motion_notify& evt) override;
void handle(const evt::button_press& evt) override;
void handle(const evt::expose& evt) override;
void handle(const evt::property_notify& evt) override;
void handle(const evt::configure_notify& evt) override;
bool on(const signals::ui::dim_window&) override;
fix mouseover error when only one cursor is defined If only cursor-click or cursor-scroll is defined, but not the other, the bar could try to set the cursor to the empty string which resulted in an error.
2022-03-20 18:09:45 +00:00
fix: make xcb-cursor optional for now
2017-09-06 06:35:29 +00:00
#if WITH_XCURSOR
fix mouseover error when only one cursor is defined If only cursor-click or cursor-scroll is defined, but not the other, the bar could try to set the cursor to the empty string which resulted in an error.
2022-03-20 18:09:45 +00:00
/**
* Change cursor to the given cursor name.
*
* The cursor name must be valid (cursor_util::valid)
*/
void change_cursor(const string& name);
fix: make xcb-cursor optional for now
2017-09-06 06:35:29 +00:00
#endif
wip: Window autohide
2016-12-21 03:50:43 +00:00
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
private:
connection& m_connection;
wip(refactor): Improve signal and event handling
2016-12-05 19:41:00 +00:00
signal_emitter& m_sig;
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
const config& m_conf;
const logger& m_log;
Eventloop cleanup (#2577) * eventloop: Use eventloop namespace in cpp files * changelog: Add missing deprecated hook message * Make eventloop and ipc classes non-copyable and non-movable * Remove functional.hpp * eventloop: Don't close handles in error cases Client should be responsible for closing handles. * eventloop: Address invalidation of handle references
2022-01-22 21:00:26 +00:00
eventloop::loop& m_loop;
feat: Reload on XCB_RANDR_SCREEN_CHANGE_NOTIFY
2016-11-26 23:46:41 +00:00
unique_ptr<screen> m_screen;
refactor: Don't initialize forward declared members Using brace initialization here causes bar.hpp to not compile when included on its own, forcing all clients to also include tray_manager.hpp and so on, which defeats the purpose of forward declaring those classes. This also allows us to remove the tray_manager.hpp, renderer.hpp and parser.hpp includes from the clients of bar.hpp
2018-05-06 15:45:43 +00:00
unique_ptr<tray_manager> m_tray;
unique_ptr<renderer> m_renderer;
New Tag Parser (#2303) * refactor(color): Use enum class for color type * Add testcases for tag parser * Make tag parser a pull-style parser Being able to parse single elements at a time gives us more fine-grained error messages, we can also parse as much as possible and only stop after an exception. * fix(color): Parser did not check for invalid chars * tag parser: First full implementation * tag parser: Fix remaining failing tests * tag parser: Replace old parser * tag parser: Treat alignment as formatting tag Makes the structure less complex and the alignment tags really are formatting tags, they are structurally no different from the %{R} tag. * tag parser: Cleanup type definitions All type definitions for tags now live in tags/types.hpp, the parser.hpp only contains the definitions necessary for actually calling the parser, this shouldn't be included in many places (only places that actually do parsing). But many places need the definitions for the tags themselves. * Rename components/parser to tags/dispatch * tag parser: Cleanup * Add changelog
2020-12-17 19:37:28 +00:00
unique_ptr<tags::dispatch> m_dispatch;
Move most action state out of renderer The renderer now only stores the positions of the actions because that is specific to the renderer and because the actual position can only be finalized after all the rendering is done because intitially the positions are relative to the alignment and not the bar.
2021-01-10 19:49:50 +00:00
unique_ptr<tags::action_context> m_action_ctxt;
refactor: Code cleanup
2016-11-04 17:54:33 +00:00
refactor: Move all event handling to the controller
2016-12-20 04:05:43 +00:00
bar_settings m_opts{};
refactor: Tray transparency and code cleaning - Make pseudo-transparency work as intended, fixes #158 - Fill tray pixmap in case a root pixmap is not found - Split up bar bootstrap routine - Formatting (clang-format)
2016-11-12 11:56:39 +00:00
refactor(clang-tidy): Apply fixes
2016-12-15 02:30:41 +00:00
string m_lastinput{};
Integrate bar taskqueue into eventloop (#2510) * Remove DEBUG_SHADED Was disabled by default AND behind an #if 0 * Make TimerHandle expose more libuv functions * Prepare for moving double clicks into eventloop * Make eventloop available to bar * Remove bar mutex Everything in the bar is now in the same thread * Move double-click handling to eventloop * Extract double click deferred function into method * Stop throttling clicks * Increase double click interval to 400 and add option double-click-interval in the bar section Closes #1441 * Implement dimming using timer handles * Remove taskqueue * Remove unused dependencies * Cleanup & Comments
2021-09-27 15:35:45 +00:00
bool m_dblclicks{false};
refactor: Cleanup
2016-11-26 05:13:20 +00:00
Use sockets for IPC (#2539) Deprecates not using `polybar-msg` for IPC. Fixes #2532 Closes #2465 Fixes #2504 * Create FIFO specific NamedPipeHandle subclass to PipeHandle * Prototype SocketHandle * Move mainloop up to main.cpp * Pass eventloop to ipc class * Deprecate sending ipc over the named pipe Unfortunately, we can only show the warning in the polybar log and not give the user any feedback because the pipe is one-way * Move eventloop into its own namespace * Prototype ipc socket handling * Remove handles from ipc_client Should be independent from eventloop logic * Remove ipc clients when finished * Add tests for ipc_client decoding * Add callback for complete ipc messages * Remove template param from mixins * Move signal handler to new callback system * Move poll handle to new callback system * Move FSEventHandle to new callback system * Move TimerHandle and AsyncHandle to new callback system * Move PipeHandle to new callback system * Implement socket functionality in new callback system * Correctly reset ipc named pipe handle * Let client close handles in error callback * Wrap client pipe and ipc::client in connection class * Better decoder log messages * Socket path logic * Fix CI warnings * Remove UVHandleGeneric * Fix error when socket folder already exists * Proof of concept message writeback * Restructure ipc files * polybar-msg: Use sockets * polybar-msg: Better syntax for actions * Fix memory leak with fifo After EOF, the pipe wasn't closed and EOF was called all the time, each time allocating a new pipe. * Make polybar-msg compile on its own * Rudimentary writeback for polybar-msg * Fix payload reference going out of scope. * Add IPC documentation * Cleanup polybar-msg code * Specify the v0 ipc message format * Close ipc connection after message * Fix ipc tests * Properly close ipc connections * Fix polybar-msg not working with action string * Write polybar-msg manpage * polybar-msg: Stop using exit() * ipc: Print log message with PID * Add tests for ipc util * polybar-msg: Print PID with success message * ipc: Propagate message errors * Rename ipc::client to ipc::decoder * Rename ipc.cpp to polybar-msg.cpp * ipc: Write encoder function and fix decoder bugs * ipc: Use message format for responses * ipc: Handle wrong message types * ipc: Write back error message if ipc message cannot be processed This only happens for commands and empty actions. Non-empty actions are not immediately executed, but deferred until the next loop iteration. * Remove TODO about deleting runtime directory The socket file is not deleted after socket.close() is called, only after libuv executes the close callback. So we can't just call rmdir because it will probably always fail. * CLeanup WriteRequest * Update manpage authors * Cleanup
2022-01-22 19:35:37 +00:00
eventloop::TimerHandle& m_leftclick_timer{m_loop.handle<eventloop::TimerHandle>()};
eventloop::TimerHandle& m_middleclick_timer{m_loop.handle<eventloop::TimerHandle>()};
eventloop::TimerHandle& m_rightclick_timer{m_loop.handle<eventloop::TimerHandle>()};
eventloop::TimerHandle& m_dim_timer{m_loop.handle<eventloop::TimerHandle>()};
feat(ipc): Add visibility commands
2017-04-21 16:15:18 +00:00
bool m_visible{true};
refactor: Application rewrite
2016-06-15 03:32:35 +00:00
};
fix: project rename
2016-11-19 05:22:44 +00:00
POLYBAR_NS_END
Reference in New Issue Copy Permalink