X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fappwidget.cc;h=c62a0d924720ae936956d1ab888385f632fa5539;hb=edcd9726300534de19c767f88022ae0fcc7a7b75;hp=ee5428838185685beacc2869ca93b0e5fb9d20d8;hpb=c97915f445017d36667a6ad32767fa41d14d23b1;p=chaz%2Fopenbox diff --git a/otk/appwidget.cc b/otk/appwidget.cc index ee542883..c62a0d92 100644 --- a/otk/appwidget.cc +++ b/otk/appwidget.cc @@ -6,6 +6,7 @@ #include "appwidget.hh" #include "application.hh" +#include "property.hh" extern "C" { #include @@ -14,19 +15,16 @@ extern "C" { namespace otk { AppWidget::AppWidget(Application *app, Direction direction, - Cursor cursor, int bevel_width) + Cursor cursor, int bevel_width) : Widget(app, app->getStyle(), direction, cursor, bevel_width), _application(app) { assert(app); - _wm_protocols = XInternAtom(**display, "WM_PROTOCOLS", false); - _wm_delete = XInternAtom(**display, "WM_DELETE_WINDOW", false); - // set WM Protocols on the window Atom protocols[2]; - protocols[0] = _wm_protocols; - protocols[1] = _wm_delete; + protocols[0] = Property::atoms.wm_protocols; + protocols[1] = Property::atoms.wm_delete_window; XSetWMProtocols(**display, window(), protocols, 2); } @@ -51,8 +49,8 @@ void AppWidget::hide(void) void AppWidget::clientMessageHandler(const XClientMessageEvent &e) { EventHandler::clientMessageHandler(e); - if (e.message_type == _wm_protocols && - static_cast(e.data.l[0]) == _wm_delete) + if (e.message_type == Property::atoms.wm_protocols && + static_cast(e.data.l[0]) == Property::atoms.wm_delete_window) hide(); }