X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.cc;h=bfaefb7c8b1277247d593272d603ef6372e6e7d0;hb=9e4d1bbabcabef13b740dd7201e35c3314abfbee;hp=4a5ef09981618afc3b4d2967c5663a98fd7057ac;hpb=641bc819d1b399d2313e3328d111dd70777ecfea;p=chaz%2Fopenbox diff --git a/src/blackbox.cc b/src/blackbox.cc index 4a5ef099..bfaefb7c 100644 --- a/src/blackbox.cc +++ b/src/blackbox.cc @@ -79,11 +79,10 @@ using std::string; #include "otk/gccache.hh" #include "otk/image.hh" #include "otk/assassin.hh" -#include "screen.hh" -#include "util.hh" +#include "bbscreen.hh" +#include "otk/util.hh" #include "bbwindow.hh" #include "workspace.hh" -#include "atom.hh" namespace ob { @@ -103,12 +102,12 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc) argv = m_argv; // try to make sure the ~/.openbox directory exists - mkdir(expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC | + mkdir(otk::expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); if (! rc) rc = "~/.openbox/rc3"; - rc_file = expandTilde(rc); + rc_file = otk::expandTilde(rc); config.setFile(rc_file); no_focus = False; @@ -120,7 +119,7 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc) load_rc(); - xatom = new OBAtom(); + xatom = new otk::OBProperty(); cursor.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr); cursor.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur); @@ -558,7 +557,7 @@ void Blackbox::process_event(XEvent *e) { case ClientMessage: { if (e->xclient.format == 32) { - if (e->xclient.message_type == xatom->getAtom(OBAtom::wm_change_state)) { + if (e->xclient.message_type == xatom->atom(otk::OBProperty::wm_change_state)) { // WM_CHANGE_STATE message BlackboxWindow *win = searchWindow(e->xclient.window); if (! win || ! win->validateClient()) return; @@ -568,9 +567,9 @@ void Blackbox::process_event(XEvent *e) { if (e->xclient.data.l[0] == NormalState) win->deiconify(); } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::blackbox_change_workspace) || + xatom->atom(otk::OBProperty::blackbox_change_workspace) || e->xclient.message_type == - xatom->getAtom(OBAtom::net_current_desktop)) { + xatom->atom(otk::OBProperty::net_current_desktop)) { // NET_CURRENT_DESKTOP message BScreen *screen = searchScreen(e->xclient.window); @@ -578,14 +577,14 @@ void Blackbox::process_event(XEvent *e) { if (screen && workspace < screen->getWorkspaceCount()) screen->changeWorkspaceID(workspace); } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::blackbox_change_window_focus)) { + xatom->atom(otk::OBProperty::blackbox_change_window_focus)) { // TEMP HACK TO KEEP BBKEYS WORKING BlackboxWindow *win = searchWindow(e->xclient.window); if (win && win->isVisible() && win->setInputFocus()) win->installColormap(True); } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_active_window)) { + xatom->atom(otk::OBProperty::net_active_window)) { // NET_ACTIVE_WINDOW BlackboxWindow *win = searchWindow(e->xclient.window); @@ -606,7 +605,7 @@ void Blackbox::process_event(XEvent *e) { } } } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::blackbox_cycle_window_focus)) { + xatom->atom(otk::OBProperty::blackbox_cycle_window_focus)) { // BLACKBOX_CYCLE_WINDOW_FOCUS BScreen *screen = searchScreen(e->xclient.window); @@ -617,7 +616,7 @@ void Blackbox::process_event(XEvent *e) { screen->nextFocus(); } } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_wm_desktop)) { + xatom->atom(otk::OBProperty::net_wm_desktop)) { // NET_WM_DESKTOP BlackboxWindow *win = searchWindow(e->xclient.window); @@ -640,7 +639,7 @@ void Blackbox::process_event(XEvent *e) { } } } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::blackbox_change_attributes)) { + xatom->atom(otk::OBProperty::blackbox_change_attributes)) { // BLACKBOX_CHANGE_ATTRIBUTES BlackboxWindow *win = searchWindow(e->xclient.window); @@ -655,45 +654,45 @@ void Blackbox::process_event(XEvent *e) { win->changeBlackboxHints(&net); } } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_number_of_desktops)) { + xatom->atom(otk::OBProperty::net_number_of_desktops)) { // NET_NUMBER_OF_DESKTOPS BScreen *screen = searchScreen(e->xclient.window); if (e->xclient.data.l[0] > 0) screen->changeWorkspaceCount((unsigned) e->xclient.data.l[0]); } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_close_window)) { + xatom->atom(otk::OBProperty::net_close_window)) { // NET_CLOSE_WINDOW BlackboxWindow *win = searchWindow(e->xclient.window); if (win && win->validateClient()) win->close(); // could this be smarter? } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_wm_moveresize)) { + xatom->atom(otk::OBProperty::net_wm_moveresize)) { // NET_WM_MOVERESIZE BlackboxWindow *win = searchWindow(e->xclient.window); if (win && win->validateClient()) { int x_root = e->xclient.data.l[0], y_root = e->xclient.data.l[1]; if ((Atom) e->xclient.data.l[2] == - xatom->getAtom(OBAtom::net_wm_moveresize_move)) { + xatom->atom(otk::OBProperty::net_wm_moveresize_move)) { win->beginMove(x_root, y_root); } else { if ((Atom) e->xclient.data.l[2] == - xatom->getAtom(OBAtom::net_wm_moveresize_size_topleft)) + xatom->atom(otk::OBProperty::net_wm_moveresize_size_topleft)) win->beginResize(x_root, y_root, BlackboxWindow::TopLeft); else if ((Atom) e->xclient.data.l[2] == - xatom->getAtom(OBAtom::net_wm_moveresize_size_topright)) + xatom->atom(otk::OBProperty::net_wm_moveresize_size_topright)) win->beginResize(x_root, y_root, BlackboxWindow::TopRight); else if ((Atom) e->xclient.data.l[2] == - xatom->getAtom(OBAtom::net_wm_moveresize_size_bottomleft)) + xatom->atom(otk::OBProperty::net_wm_moveresize_size_bottomleft)) win->beginResize(x_root, y_root, BlackboxWindow::BottomLeft); else if ((Atom) e->xclient.data.l[2] == - xatom->getAtom(OBAtom::net_wm_moveresize_size_bottomright)) + xatom->atom(otk::OBProperty::net_wm_moveresize_size_bottomright)) win->beginResize(x_root, y_root, BlackboxWindow::BottomRight); } } } else if (e->xclient.message_type == - xatom->getAtom(OBAtom::net_wm_state)) { + xatom->atom(otk::OBProperty::net_wm_state)) { // NET_WM_STATE BlackboxWindow *win = searchWindow(e->xclient.window); if (win && win->validateClient()) { @@ -707,10 +706,10 @@ void Blackbox::process_event(XEvent *e) { if ((Atom) e->xclient.data.l[0] == 1) { // ADD - if (state[i] == xatom->getAtom(OBAtom::net_wm_state_modal)) { + if (state[i] == xatom->atom(otk::OBProperty::net_wm_state_modal)) { win->setModal(True); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_vert)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_vert)) { if (win->isMaximizedHoriz()) { win->maximize(0); // unmaximize win->maximize(1); // full @@ -718,7 +717,7 @@ void Blackbox::process_event(XEvent *e) { win->maximize(2); // vert } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_horz)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_horz)) { if (win->isMaximizedVert()) { win->maximize(0); // unmaximize win->maximize(1); // full @@ -726,25 +725,25 @@ void Blackbox::process_event(XEvent *e) { win->maximize(3); // horiz } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_shaded)) { + xatom->atom(otk::OBProperty::net_wm_state_shaded)) { if (! win->isShaded()) win->shade(); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_taskbar)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { win->setSkipTaskbar(True); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_pager)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_pager)) { win->setSkipPager(True); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_fullscreen)) { + xatom->atom(otk::OBProperty::net_wm_state_fullscreen)) { win->setFullscreen(True); } } else if (action == 0) { // REMOVE - if (state[i] == xatom->getAtom(OBAtom::net_wm_state_modal)) { + if (state[i] == xatom->atom(otk::OBProperty::net_wm_state_modal)) { win->setModal(False); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_vert)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_vert)) { if (win->isMaximizedFull()) { win->maximize(0); // unmaximize win->maximize(3); // horiz @@ -752,7 +751,7 @@ void Blackbox::process_event(XEvent *e) { win->maximize(0); // unmaximize } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_horz)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_horz)) { if (win->isMaximizedFull()) { win->maximize(0); // unmaximize win->maximize(2); // vert @@ -760,25 +759,25 @@ void Blackbox::process_event(XEvent *e) { win->maximize(0); // unmaximize } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_shaded)) { + xatom->atom(otk::OBProperty::net_wm_state_shaded)) { if (win->isShaded()) win->shade(); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_taskbar)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { win->setSkipTaskbar(False); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_pager)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_pager)) { win->setSkipPager(False); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_fullscreen)) { + xatom->atom(otk::OBProperty::net_wm_state_fullscreen)) { win->setFullscreen(False); } } else if (action == 2) { // TOGGLE - if (state[i] == xatom->getAtom(OBAtom::net_wm_state_modal)) { + if (state[i] == xatom->atom(otk::OBProperty::net_wm_state_modal)) { win->setModal(! win->isModal()); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_vert)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_vert)) { if (win->isMaximizedFull()) { win->maximize(0); // unmaximize win->maximize(3); // horiz @@ -791,7 +790,7 @@ void Blackbox::process_event(XEvent *e) { win->maximize(2); // vert } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_maximized_horz)) { + xatom->atom(otk::OBProperty::net_wm_state_maximized_horz)) { if (win->isMaximizedFull()) { win->maximize(0); // unmaximize win->maximize(2); // vert @@ -804,16 +803,16 @@ void Blackbox::process_event(XEvent *e) { win->maximize(3); // horiz } } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_shaded)) { + xatom->atom(otk::OBProperty::net_wm_state_shaded)) { win->shade(); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_taskbar)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_taskbar)) { win->setSkipTaskbar(! win->skipTaskbar()); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_skip_pager)) { + xatom->atom(otk::OBProperty::net_wm_state_skip_pager)) { win->setSkipPager(! win->skipPager()); } else if (state[i] == - xatom->getAtom(OBAtom::net_wm_state_fullscreen)) { + xatom->atom(otk::OBProperty::net_wm_state_fullscreen)) { win->setFullscreen(! win->isFullscreen()); } } @@ -832,7 +831,7 @@ void Blackbox::process_event(XEvent *e) { default: { #ifdef SHAPE - if (e->type == getShapeEventBase()) { + if (e->type == otk::OBDisplay::shapeEventBase()) { XShapeEvent *shape_event = (XShapeEvent *) e; BlackboxWindow *win = searchWindow(e->xany.window); @@ -1063,7 +1062,7 @@ void Blackbox::load_rc(void) { else if (resource.colors_per_channel > 6) resource.colors_per_channel = 6; if (config.getValue("session.styleFile", s)) - resource.style_file = expandTilde(s); + resource.style_file = otk::expandTilde(s); else resource.style_file = DEFAULTSTYLE;