dany/wf-osk
1
0
Fork 0
mirror of https://github.com/WayfireWM/wf-osk.git synced 2025-04-05 12:56:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

style: fixed style issues

Browse Source
This commit is contained in:
Matteo Sozzi 2019-07-21 16:34:33 +02:00
parent 5d26011ccc
commit 4592b3208b
5 changed files with 116 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proto/meson.build
View File

@ -15,8 +15,8 @@ wayland_scanner_client = generator(
) )
client_protocols = [ client_protocols = [
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
['wayfire-shell.xml'], ['wayfire-shell.xml'],
['wlr-layer-shell-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'],
['virtual-keyboard-unstable-v1.xml'] ['virtual-keyboard-unstable-v1.xml']
] ]

40
src/main.cpp
View File

@ -21,7 +21,7 @@ namespace wf
int default_y = 100; int default_y = 100;
int default_width = 800; int default_width = 800;
int default_height = 400; int default_height = 400;
std::string anchor; std::string anchor;
KeyButton::KeyButton(Key key, int width, int height) KeyButton::KeyButton(Key key, int width, int height)
{ {
@ -178,26 +178,30 @@ namespace wf
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool show_help = false; bool show_help = false;
auto cli = clara::detail::Help(show_help) | auto cli = clara::detail::Help(show_help) |
clara::detail::Opt(wf::osk::default_x, "int")["-x"]("x position (wf-shell only)") | clara::detail::Opt(wf::osk::default_x, "int")["-x"]
clara::detail::Opt(wf::osk::default_y, "int")["-y"]("y position (wf-shell only)") | ("x position (wf-shell only)") |
clara::detail::Opt(wf::osk::default_width, "int")["-w"]["--width"]("keyboard width") | clara::detail::Opt(wf::osk::default_y, "int")["-y"]
clara::detail::Opt(wf::osk::default_height, "int")["-h"]["--height"]("keyboard height") | ("y position (wf-shell only)") |
clara::detail::Opt(wf::osk::anchor, "top|left|bottom|right")["-a"]["--anchor"] clara::detail::Opt(wf::osk::default_width, "int")["-w"]["--width"]
("where the keyboard should anchor in the screen"); ("keyboard width") |
clara::detail::Opt(wf::osk::default_height, "int")["-h"]["--height"]
("keyboard height") |
clara::detail::Opt(wf::osk::anchor, "top|left|bottom|right")["-a"]
["--anchor"]("where the keyboard should anchor in the screen");
auto res = cli.parse(clara::detail::Args(argc, argv)); auto res = cli.parse(clara::detail::Args(argc, argv));
if (!res) { if (!res) {
std::cerr << "Error: " << res.errorMessage() << std::endl; std::cerr << "Error: " << res.errorMessage() << std::endl;
return 1; return 1;
} }
if (show_help) { if (show_help) {
std::cout << cli << std::endl; std::cout << cli << std::endl;
return 0; return 0;
} }
auto app = Gtk::Application::create(); auto app = Gtk::Application::create();
wf::osk::Keyboard::create(); wf::osk::Keyboard::create();

2
src/util/clara.hpp
View File

@ -821,7 +821,7 @@ namespace detail {
template<typename T> template<typename T>
auto operator|( T const &other ) const -> Parser; auto operator|( T const &other ) const -> Parser;
template<typename T> template<typename T>
auto operator+( T const &other ) const -> Parser; auto operator+( T const &other ) const -> Parser;
}; };

154
src/wayland-window.cpp
View File

@ -51,21 +51,23 @@ namespace wf
&registry_remove_object &registry_remove_object
}; };
static void layer_shell_handle_configure(void *data, struct zwlr_layer_surface_v1 *zwlr_layer_surface, static void layer_shell_handle_configure(void *data,
uint32_t serial, uint32_t width, uint32_t height) struct zwlr_layer_surface_v1 *zwlr_layer_surface, uint32_t serial,
uint32_t width, uint32_t height)
{ {
zwlr_layer_surface_v1_ack_configure(zwlr_layer_surface, serial); zwlr_layer_surface_v1_ack_configure(zwlr_layer_surface, serial);
} }
static void layer_shell_handle_close(void *data, struct zwlr_layer_surface_v1 *surface) static void layer_shell_handle_close(void *data,
struct zwlr_layer_surface_v1 *surface)
{ {
zwlr_layer_surface_v1_destroy(surface); zwlr_layer_surface_v1_destroy(surface);
} }
static struct zwlr_layer_surface_v1_listener layer_surface_listener = static struct zwlr_layer_surface_v1_listener layer_surface_listener =
{ {
&layer_shell_handle_configure, &layer_shell_handle_configure,
&layer_shell_handle_close &layer_shell_handle_close
}; };
WaylandDisplay::WaylandDisplay() WaylandDisplay::WaylandDisplay()
@ -99,65 +101,67 @@ namespace wf
return instance; return instance;
} }
uint32_t WaylandWindow::checkAnchorForWayfireShell(int width, int height, std::string anchor) uint32_t WaylandWindow::check_anchor_for_wayfire_shell(int width,
int height, std::string anchor)
{ {
if (anchor.empty()) if (anchor.empty())
{ {
return 0; return 0;
} }
std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower); std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower);
uint32_t parsed_anchor = 0; uint32_t parsed_anchor = 0;
if (anchor.compare("top") == 0) if (anchor.compare("top") == 0)
{ {
parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_TOP; parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_TOP;
} else if (anchor.compare("bottom") == 0) } else if (anchor.compare("bottom") == 0)
{ {
parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_BOTTOM; parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_BOTTOM;
} else if (anchor.compare("left") == 0) } else if (anchor.compare("left") == 0)
{ {
parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_LEFT; parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_LEFT;
} else if (anchor.compare("right") == 0) } else if (anchor.compare("right") == 0)
{ {
parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_RIGHT; parsed_anchor = ZWF_WM_SURFACE_V1_ANCHOR_EDGE_RIGHT;
} }
return parsed_anchor; return parsed_anchor;
} }
uint32_t WaylandWindow::checkAnchorForLayerShell(int width, int height, std::string anchor) uint32_t WaylandWindow::check_anchor_for_layer_shell(int width, int height,
std::string anchor)
{ {
if (anchor.empty()) if (anchor.empty())
{ {
return 0; return 0;
} }
std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower); std::transform(anchor.begin(), anchor.end(), anchor.begin(), ::tolower);
uint32_t parsed_anchor = 0; uint32_t parsed_anchor = 0;
if (anchor.compare("top") == 0) if (anchor.compare("top") == 0)
{ {
parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
} else if (anchor.compare("bottom") == 0) } else if (anchor.compare("bottom") == 0)
{ {
parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
} else if (anchor.compare("left") == 0) } else if (anchor.compare("left") == 0)
{ {
parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT; parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
} else if (anchor.compare("right") == 0) } else if (anchor.compare("right") == 0)
{ {
parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; parsed_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
} }
return parsed_anchor; return parsed_anchor;
} }
void WaylandWindow::initWayfireShell(WaylandDisplay display, int x, int y, int width, void WaylandWindow::init_wayfire_shell(WaylandDisplay display, int x, int y,
int height, std::string anchor) int width, int height, std::string anchor)
{ {
this->show_all(); this->show_all();
auto gdk_window = this->get_window()->gobj(); auto gdk_window = this->get_window()->gobj();
auto surface = gdk_wayland_window_get_wl_surface(gdk_window); auto surface = gdk_wayland_window_get_wl_surface(gdk_window);
if (!surface) if (!surface)
@ -166,24 +170,27 @@ namespace wf
std::exit(-1); std::exit(-1);
} }
wf_surface = zwf_shell_manager_v1_get_wm_surface(display.wf_manager, surface, wf_surface = zwf_shell_manager_v1_get_wm_surface(display.wf_manager,
ZWF_WM_SURFACE_V1_ROLE_DESKTOP_WIDGET, nullptr); surface, ZWF_WM_SURFACE_V1_ROLE_DESKTOP_WIDGET, nullptr);
zwf_wm_surface_v1_set_keyboard_mode(wf_surface, ZWF_WM_SURFACE_V1_KEYBOARD_FOCUS_MODE_NO_FOCUS); zwf_wm_surface_v1_set_keyboard_mode(wf_surface,
ZWF_WM_SURFACE_V1_KEYBOARD_FOCUS_MODE_NO_FOCUS);
uint32_t parsed_anchor = checkAnchorForWayfireShell(width, height, anchor); uint32_t parsed_anchor = check_anchor_for_wayfire_shell(width,
zwf_wm_surface_v1_set_anchor(wf_surface, parsed_anchor); height, anchor);
zwf_wm_surface_v1_configure(wf_surface, x, y); zwf_wm_surface_v1_set_anchor(wf_surface, parsed_anchor);
zwf_wm_surface_v1_configure(wf_surface, x, y);
} }
void WaylandWindow::initLayerShell(WaylandDisplay display, int width, int height, std::string anchor) void WaylandWindow::init_layer_shell(WaylandDisplay display, int width,
int height, std::string anchor)
{ {
auto gtk_window = this->gobj(); auto gtk_window = this->gobj();
auto gtk_widget = GTK_WIDGET(gtk_window); auto gtk_widget = GTK_WIDGET(gtk_window);
gtk_widget_realize(gtk_widget); gtk_widget_realize(gtk_widget);
auto gdk_window = this->get_window()->gobj(); auto gdk_window = this->get_window()->gobj();
gdk_wayland_window_set_use_custom_surface(gdk_window); gdk_wayland_window_set_use_custom_surface(gdk_window);
auto surface = gdk_wayland_window_get_wl_surface(gdk_window); auto surface = gdk_wayland_window_get_wl_surface(gdk_window);
if (!surface) if (!surface)
@ -192,31 +199,34 @@ namespace wf
std::exit(-1); std::exit(-1);
} }
uint32_t layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP; uint32_t layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
layer_surface = zwlr_layer_shell_v1_get_layer_surface(display.layer_shell, layer_surface = zwlr_layer_shell_v1_get_layer_surface(
surface, NULL, layer, "wf-osk"); display.layer_shell, surface, NULL, layer, "wf-osk");
if (!layer_surface) if (!layer_surface)
{ {
std::cerr << "Error: could not create layer surface" << std::endl; std::cerr << "Error: could not create layer surface" << std::endl;
std::exit(-1); std::exit(-1);
} }
zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, nullptr); zwlr_layer_surface_v1_add_listener(layer_surface,
&layer_surface_listener, nullptr);
zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, 0); zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, 0);
zwlr_layer_surface_v1_set_size(layer_surface, width, height); zwlr_layer_surface_v1_set_size(layer_surface, width, height);
uint32_t parsed_anchor = checkAnchorForLayerShell(width, height, anchor); uint32_t parsed_anchor = check_anchor_for_layer_shell(width,
height, anchor);
zwlr_layer_surface_v1_set_anchor(layer_surface, parsed_anchor); zwlr_layer_surface_v1_set_anchor(layer_surface, parsed_anchor);
wl_surface_commit(surface); wl_surface_commit(surface);
auto gdk_display = gdk_display_get_default(); auto gdk_display = gdk_display_get_default();
auto wl_display = gdk_wayland_display_get_wl_display(gdk_display); auto wl_display = gdk_wayland_display_get_wl_display(gdk_display);
wl_display_roundtrip(wl_display); wl_display_roundtrip(wl_display);
this->show_all(); this->show_all();
} }
WaylandWindow::WaylandWindow(int x, int y, int width, int height, std::string anchor) WaylandWindow::WaylandWindow(int x, int y, int width, int height,
std::string anchor)
: Gtk::Window() : Gtk::Window()
{ {
auto display = WaylandDisplay::get(); auto display = WaylandDisplay::get();
@ -228,10 +238,10 @@ namespace wf
if (display.wf_manager) if (display.wf_manager)
{ {
initWayfireShell(display, x, y, width, height, anchor); init_wayfire_shell(display, x, y, width, height, anchor);
} else if (display.layer_shell) } else if (display.layer_shell)
{ {
initLayerShell(display, width, height, anchor); init_layer_shell(display, width, height, anchor);
} else { } else {
std::cerr << "Error: cannot find any supported shell protocol" << std::endl; std::cerr << "Error: cannot find any supported shell protocol" << std::endl;
std::exit(-1); std::exit(-1);

14
src/wayland-window.hpp
View File

@ -22,14 +22,18 @@ namespace wf
class WaylandWindow : public Gtk::Window class WaylandWindow : public Gtk::Window
{ {
zwf_wm_surface_v1 *wf_surface; zwf_wm_surface_v1 *wf_surface;
zwlr_layer_surface_v1 *layer_surface; zwlr_layer_surface_v1 *layer_surface;
uint32_t checkAnchorForWayfireShell(int width, int height, std::string anchor); uint32_t check_anchor_for_wayfire_shell(int width, int height,
uint32_t checkAnchorForLayerShell(int width, int height, std::string anchor); std::string anchor);
uint32_t check_anchor_for_layer_shell(int width, int height,
std::string anchor);
void initWayfireShell(WaylandDisplay display, int x, int y, int width, int height, std::string anchor); void init_wayfire_shell(WaylandDisplay display, int x, int y,
void initLayerShell(WaylandDisplay display, int width, int height, std::string anchor); int width, int height, std::string anchor);
void init_layer_shell(WaylandDisplay display, int width, int height,
std::string anchor);
public: public:
WaylandWindow(int x, int y, int width, int height, std::string anchor); WaylandWindow(int x, int y, int width, int height, std::string anchor);