summaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@opera.com>2020-07-17 12:10:54 +0200
committerJoel Klinghed <the_jk@opera.com>2020-07-17 12:10:54 +0200
commit2df36164c6dfaa4c1dfbd7bb652ff9837c8d912c (patch)
treec5dbbf55619c2dc0dee01672d21cafbf6340369a /src/main.cc
parentc8fd8d3c3f12e6895246c5a0566a9f595ce5db20 (diff)
Move IceccMonMon::connect to MonMon
All implementations are going to need a "connect" method
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cc b/src/main.cc
index 53e9a7f..4bcbdd3 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -200,10 +200,11 @@ int main(int argc, char** argv) {
atoms->preload("__MONMON_QUIT");
MonMon::preload(atoms.get());
std::shared_ptr<x::Ewmh> ewmh(x::Ewmh::create(conn, screen_index));
- std::shared_ptr<IceccMonMon> monmon(create_icecc_monmon(looper, columns));
+ std::shared_ptr<MonMon> monmon(create_icecc_monmon(looper, columns));
monmon->init(conn, screen, format, atoms, ewmh, 400, 400,
args->is_set("titlebar"), args->is_set("black"));
- monmon->connect(args.get());
+ if (!monmon->connect(args.get()))
+ return EXIT_FAILURE;
std::thread xcb_thread(xcb_event_loop, conn, atoms, monmon);
conn.reset();
looper->run();