X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=0bbcebc6d8d694de53f06a283ef53b7147e75d23;hb=5b52a8f5610d3cc0a39ecb6b341e69596d892099;hp=22ff3ca96483f3222ac8aec377007ccfe4ae6937;hpb=cdcc526a0274cace9f542960fe4eee4ddcc23d31;p=chaz%2Fopenbox diff --git a/src/screen.cc b/src/screen.cc index 22ff3ca9..0bbcebc6 100644 --- a/src/screen.cc +++ b/src/screen.cc @@ -29,6 +29,7 @@ extern "C" { #include "bindings.hh" #include "python.hh" #include "otk/display.hh" +#include "otk/property.hh" #include #include @@ -65,18 +66,15 @@ Screen::Screen(int screen) printf(_("Managing screen %d: visual 0x%lx, depth %d\n"), _number, XVisualIDFromVisual(_info->visual()), _info->depth()); - openbox->property()->set(_info->rootWindow(), - otk::Property::openbox_pid, - otk::Property::Atom_Cardinal, - (unsigned long) getpid()); + otk::Property::set(_info->rootWindow(), otk::Property::atoms.openbox_pid, + otk::Property::atoms.cardinal, (unsigned long) getpid()); // set the mouse cursor for the root window (the default cursor) XDefineCursor(**otk::display, _info->rootWindow(), openbox->cursors().session); // initialize the shit that is used for all drawing on the screen - _image_control = new otk::ImageControl(openbox->timerManager(), - _info, true); + _image_control = new otk::ImageControl(_info, true); _image_control->installRootColormap(); _root_cmap_installed = True; @@ -101,18 +99,16 @@ Screen::Screen(int screen) // Set the netwm properties for geometry unsigned long geometry[] = { _info->width(), _info->height() }; - openbox->property()->set(_info->rootWindow(), - otk::Property::net_desktop_geometry, - otk::Property::Atom_Cardinal, - geometry, 2); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_desktop_geometry, + otk::Property::atoms.cardinal, geometry, 2); // Set the net_desktop_names property std::vector names; python_get_stringlist("desktop_names", &names); - openbox->property()->set(_info->rootWindow(), - otk::Property::net_desktop_names, - otk::Property::utf8, - names); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_desktop_names, + otk::Property::utf8, names); // the above set() will cause the updateDesktopNames to fire right away so // we have a list of desktop names @@ -129,7 +125,7 @@ Screen::Screen(int screen) _focuswindow = XCreateWindow(**otk::display, _info->rootWindow(), -100, -100, 1, 1, 0, 0, InputOnly, _info->visual(), CWOverrideRedirect, &attr); - XMapWindow(**otk::display, _focuswindow); + XMapRaised(**otk::display, _focuswindow); // these may be further updated if any pre-existing windows are found in // the manageExising() function @@ -284,91 +280,82 @@ void Screen::changeSupportedAtoms() 0, 0, 1, 1, 0, 0, 0); // set supporting window - openbox->property()->set(_info->rootWindow(), - otk::Property::net_supporting_wm_check, - otk::Property::Atom_Window, - _supportwindow); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_supporting_wm_check, + otk::Property::atoms.window, _supportwindow); //set properties on the supporting window - openbox->property()->set(_supportwindow, - otk::Property::net_wm_name, - otk::Property::utf8, - "Openbox"); - openbox->property()->set(_supportwindow, - otk::Property::net_supporting_wm_check, - otk::Property::Atom_Window, - _supportwindow); + otk::Property::set(_supportwindow, otk::Property::atoms.net_wm_name, + otk::Property::utf8, "Openbox"); + otk::Property::set(_supportwindow, + otk::Property::atoms.net_supporting_wm_check, + otk::Property::atoms.window, _supportwindow); Atom supported[] = { - otk::Property::net_current_desktop, - otk::Property::net_number_of_desktops, - otk::Property::net_desktop_geometry, - otk::Property::net_desktop_viewport, - otk::Property::net_active_window, - otk::Property::net_workarea, - otk::Property::net_client_list, - otk::Property::net_client_list_stacking, - otk::Property::net_desktop_names, - otk::Property::net_close_window, - otk::Property::net_wm_name, - otk::Property::net_wm_visible_name, - otk::Property::net_wm_icon_name, - otk::Property::net_wm_visible_icon_name, + otk::Property::atoms.net_current_desktop, + otk::Property::atoms.net_number_of_desktops, + otk::Property::atoms.net_desktop_geometry, + otk::Property::atoms.net_desktop_viewport, + otk::Property::atoms.net_active_window, + otk::Property::atoms.net_workarea, + otk::Property::atoms.net_client_list, + otk::Property::atoms.net_client_list_stacking, + otk::Property::atoms.net_desktop_names, + otk::Property::atoms.net_close_window, + otk::Property::atoms.net_wm_name, + otk::Property::atoms.net_wm_visible_name, + otk::Property::atoms.net_wm_icon_name, + otk::Property::atoms.net_wm_visible_icon_name, /* - otk::Property::net_wm_desktop, + otk::Property::atoms.net_wm_desktop, */ - otk::Property::net_wm_strut, - otk::Property::net_wm_window_type, - otk::Property::net_wm_window_type_desktop, - otk::Property::net_wm_window_type_dock, - otk::Property::net_wm_window_type_toolbar, - otk::Property::net_wm_window_type_menu, - otk::Property::net_wm_window_type_utility, - otk::Property::net_wm_window_type_splash, - otk::Property::net_wm_window_type_dialog, - otk::Property::net_wm_window_type_normal, + otk::Property::atoms.net_wm_strut, + otk::Property::atoms.net_wm_window_type, + otk::Property::atoms.net_wm_window_type_desktop, + otk::Property::atoms.net_wm_window_type_dock, + otk::Property::atoms.net_wm_window_type_toolbar, + otk::Property::atoms.net_wm_window_type_menu, + otk::Property::atoms.net_wm_window_type_utility, + otk::Property::atoms.net_wm_window_type_splash, + otk::Property::atoms.net_wm_window_type_dialog, + otk::Property::atoms.net_wm_window_type_normal, /* - otk::Property::net_wm_moveresize, - otk::Property::net_wm_moveresize_size_topleft, - otk::Property::net_wm_moveresize_size_topright, - otk::Property::net_wm_moveresize_size_bottomleft, - otk::Property::net_wm_moveresize_size_bottomright, - otk::Property::net_wm_moveresize_move, + otk::Property::atoms.net_wm_moveresize, + otk::Property::atoms.net_wm_moveresize_size_topleft, + otk::Property::atoms.net_wm_moveresize_size_topright, + otk::Property::atoms.net_wm_moveresize_size_bottomleft, + otk::Property::atoms.net_wm_moveresize_size_bottomright, + otk::Property::atoms.net_wm_moveresize_move, */ -/* - otk::Property::net_wm_allowed_actions, - otk::Property::net_wm_action_move, - otk::Property::net_wm_action_resize, - otk::Property::net_wm_action_shade, - otk::Property::net_wm_action_maximize_horz, - otk::Property::net_wm_action_maximize_vert, - otk::Property::net_wm_action_change_desktop, - otk::Property::net_wm_action_close, -*/ - otk::Property::net_wm_state, - otk::Property::net_wm_state_modal, - otk::Property::net_wm_state_maximized_vert, - otk::Property::net_wm_state_maximized_horz, - otk::Property::net_wm_state_shaded, - otk::Property::net_wm_state_skip_taskbar, - otk::Property::net_wm_state_skip_pager, - otk::Property::net_wm_state_hidden, - otk::Property::net_wm_state_fullscreen, - otk::Property::net_wm_state_above, - otk::Property::net_wm_state_below, - }; + otk::Property::atoms.net_wm_allowed_actions, + otk::Property::atoms.net_wm_action_move, + otk::Property::atoms.net_wm_action_resize, + otk::Property::atoms.net_wm_action_minimize, + otk::Property::atoms.net_wm_action_shade, +/* otk::Property::atoms.net_wm_action_stick,*/ + otk::Property::atoms.net_wm_action_maximize_horz, + otk::Property::atoms.net_wm_action_maximize_vert, + otk::Property::atoms.net_wm_action_fullscreen, + otk::Property::atoms.net_wm_action_change_desktop, + otk::Property::atoms.net_wm_action_close, + + otk::Property::atoms.net_wm_state, + otk::Property::atoms.net_wm_state_modal, + otk::Property::atoms.net_wm_state_maximized_vert, + otk::Property::atoms.net_wm_state_maximized_horz, + otk::Property::atoms.net_wm_state_shaded, + otk::Property::atoms.net_wm_state_skip_taskbar, + otk::Property::atoms.net_wm_state_skip_pager, + otk::Property::atoms.net_wm_state_hidden, + otk::Property::atoms.net_wm_state_fullscreen, + otk::Property::atoms.net_wm_state_above, + otk::Property::atoms.net_wm_state_below, + }; const int num_supported = sizeof(supported)/sizeof(Atom); - // convert to the atom values - for (int i = 0; i < num_supported; ++i) - supported[i] = - openbox->property()->atom((otk::Property::Atoms)supported[i]); - - openbox->property()->set(_info->rootWindow(), - otk::Property::net_supported, - otk::Property::Atom_Atom, - supported, num_supported); + otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_supported, + otk::Property::atoms.atom, supported, num_supported); } @@ -390,10 +377,8 @@ void Screen::changeClientList() } else windows = (Window*) 0; - openbox->property()->set(_info->rootWindow(), - otk::Property::net_client_list, - otk::Property::Atom_Window, - windows, size); + otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_client_list, + otk::Property::atoms.window, windows, size); if (size) delete [] windows; @@ -410,23 +395,22 @@ void Screen::changeStackingList() assert(size == clients.size()); // just making sure.. :) - // create an array of the window ids + // create an array of the window ids (from bottom to top, reverse order!) if (size > 0) { Window *win_it; windows = new Window[size]; win_it = windows; - Client::List::const_iterator it = _stacking.begin(); - const Client::List::const_iterator end = _stacking.end(); + Client::List::const_reverse_iterator it = _stacking.rbegin(); + const Client::List::const_reverse_iterator end = _stacking.rend(); for (; it != end; ++it, ++win_it) *win_it = (*it)->window(); } else windows = (Window*) 0; - openbox->property()->set(_info->rootWindow(), - otk::Property::net_client_list_stacking, - otk::Property::Atom_Window, - windows, size); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_client_list_stacking, + otk::Property::atoms.window, windows, size); if (size) delete [] windows; @@ -442,10 +426,8 @@ void Screen::changeWorkArea() { dims[(i * 4) + 2] = _area.width(); dims[(i * 4) + 3] = _area.height(); } - openbox->property()->set(_info->rootWindow(), - otk::Property::net_workarea, - otk::Property::Atom_Cardinal, - dims, 4 * _num_desktops); + otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_workarea, + otk::Property::atoms.cardinal, dims, 4 * _num_desktops); delete [] dims; } @@ -491,14 +473,6 @@ void Screen::manageWindow(Window window) // reparented back to root automatically XChangeSaveSet(**otk::display, window, SetModeInsert); - if (!(openbox->state() == Openbox::State_Starting || - client->positionRequested())) { - // position the window intelligenty .. hopefully :) - // call the python PLACEWINDOW binding - EventData data(_number, client, EventPlaceWindow, 0); - openbox->bindings()->fireEvent(&data); - } - // create the decoration frame for the client window client->frame = new Frame(client, &_style); @@ -518,13 +492,21 @@ void Screen::manageWindow(Window window) // reparent the client to the frame client->frame->grabClient(); + if (!(openbox->state() == Openbox::State_Starting || + client->positionRequested())) { + // position the window intelligenty .. hopefully :) + // call the python PLACEWINDOW binding + EventData data(_number, client, EventPlaceWindow, 0); + openbox->bindings()->fireEvent(&data); + } + // if on the current desktop.. (or all desktops) if (client->desktop() == _desktop || client->desktop() == (signed)0xffffffff) { client->frame->show(); } - - // XXX: handle any requested states such as maximized + + client->applyStartupState(); otk::display->ungrab(); @@ -532,7 +514,7 @@ void Screen::manageWindow(Window window) clients.push_back(client); // this puts into the stacking order, then raises it _stacking.push_back(client); - restack(true, client); + raiseWindow(client); // update the root properties changeClientList(); @@ -610,30 +592,54 @@ void Screen::unmanageWindow(Client *client) changeClientList(); } -void Screen::restack(bool raise, Client *client) +void Screen::lowerWindow(Client *client) { - const int layer = client->layer(); - std::vector wins; + Window wins[2]; // only ever restack 2 windows. + + assert(!_stacking.empty()); // this would be bad + + Client::List::iterator it = --_stacking.end(); + Client::List::const_iterator end = _stacking.begin(); + + for (; it != end && (*it)->layer() < client->layer(); --it); + if (*it == client) return; // already the bottom, return + + wins[0] = (*it)->frame->window(); + wins[1] = client->frame->window(); _stacking.remove(client); + _stacking.insert(++it, client); - // the stacking list is from highest to lowest + XRestackWindows(**otk::display, wins, 2); + changeStackingList(); +} + +void Screen::raiseWindow(Client *client) +{ + Window wins[2]; // only ever restack 2 windows. + + assert(!_stacking.empty()); // this would be bad + + // remove the client before looking so we can't run into ourselves + _stacking.remove(client); - Client::List::iterator it = _stacking.begin(), end = _stacking.end(); - // insert the windows above this window - for (; it != end; ++it) { - if ((*it)->layer() < layer || (raise && (*it)->layer() == layer)) - break; - wins.push_back((*it)->frame->window()); - } - // insert our client - wins.push_back(client->frame->window()); + Client::List::iterator it = _stacking.begin(); + Client::List::const_iterator end = _stacking.end(); + + // the stacking list is from highest to lowest + for (; it != end && (*it)->layer() > client->layer(); ++it); + + /* + if our new position is the top, we want to stack under the _focuswindow + otherwise, we want to stack under the previous window in the stack. + */ + wins[0] = (it == _stacking.begin() ? _focuswindow : + ((*(--Client::List::const_iterator(it)))->frame->window())); + wins[1] = client->frame->window(); + _stacking.insert(it, client); - // insert the remaining below this window - for (; it != end; ++it) - wins.push_back((*it)->frame->window()); - XRestackWindows(**otk::display, &wins[0], wins.size()); + XRestackWindows(**otk::display, wins, 2); changeStackingList(); } @@ -646,10 +652,9 @@ void Screen::changeDesktop(long desktop) long old = _desktop; _desktop = desktop; - openbox->property()->set(_info->rootWindow(), - otk::Property::net_current_desktop, - otk::Property::Atom_Cardinal, - _desktop); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_current_desktop, + otk::Property::atoms.cardinal, _desktop); if (old == _desktop) return; @@ -676,18 +681,17 @@ void Screen::changeNumDesktops(long num) // XXX: move windows on desktops that will no longer exist! _num_desktops = num; - openbox->property()->set(_info->rootWindow(), - otk::Property::net_number_of_desktops, - otk::Property::Atom_Cardinal, - _num_desktops); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_number_of_desktops, + otk::Property::atoms.cardinal, _num_desktops); // set the viewport hint unsigned long *viewport = new unsigned long[_num_desktops * 2]; memset(viewport, 0, sizeof(unsigned long) * _num_desktops * 2); - openbox->property()->set(_info->rootWindow(), - otk::Property::net_desktop_viewport, - otk::Property::Atom_Cardinal, - viewport, _num_desktops * 2); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_desktop_viewport, + otk::Property::atoms.cardinal, + viewport, _num_desktops * 2); delete [] viewport; // update the work area hint @@ -697,13 +701,11 @@ void Screen::changeNumDesktops(long num) void Screen::updateDesktopNames() { - const otk::Property *property = openbox->property(); - unsigned long num = (unsigned) -1; - if (!property->get(_info->rootWindow(), - otk::Property::net_desktop_names, - otk::Property::utf8, &num, &_desktop_names)) + if (!otk::Property::get(_info->rootWindow(), + otk::Property::atoms.net_desktop_names, + otk::Property::utf8, &num, &_desktop_names)) _desktop_names.clear(); while ((long)_desktop_names.size() < _num_desktops) _desktop_names.push_back("Unnamed"); @@ -716,12 +718,11 @@ void Screen::setDesktopName(long i, const otk::ustring &name) if (i >= _num_desktops) return; - const otk::Property *property = openbox->property(); - otk::Property::StringVect newnames = _desktop_names; newnames[i] = name; - property->set(_info->rootWindow(), otk::Property::net_desktop_names, - otk::Property::utf8, newnames); + otk::Property::set(_info->rootWindow(), + otk::Property::atoms.net_desktop_names, + otk::Property::utf8, newnames); } @@ -729,8 +730,6 @@ void Screen::propertyHandler(const XPropertyEvent &e) { otk::EventHandler::propertyHandler(e); - const otk::Property *property = openbox->property(); - // compress changes to a single property into a single change XEvent ce; while (XCheckTypedEvent(**otk::display, e.type, &ce)) { @@ -742,7 +741,7 @@ void Screen::propertyHandler(const XPropertyEvent &e) } } - if (e.atom == property->atom(otk::Property::net_desktop_names)) + if (e.atom == otk::Property::atoms.net_desktop_names) updateDesktopNames(); } @@ -753,12 +752,9 @@ void Screen::clientMessageHandler(const XClientMessageEvent &e) if (e.format != 32) return; - const otk::Property *property = openbox->property(); - - if (e.message_type == property->atom(otk::Property::net_current_desktop)) { + if (e.message_type == otk::Property::atoms.net_current_desktop) { changeDesktop(e.data.l[0]); - } else if (e.message_type == - property->atom(otk::Property::net_number_of_desktops)) { + } else if (e.message_type == otk::Property::atoms.net_number_of_desktops) { changeNumDesktops(e.data.l[0]); } // XXX: so many client messages to handle here! ..or not.. they go to clients @@ -784,8 +780,7 @@ void Screen::mapRequestHandler(const XMapRequestEvent &e) // send a net_active_window message XEvent ce; ce.xclient.type = ClientMessage; - ce.xclient.message_type = - openbox->property()->atom(otk::Property::net_active_window); + ce.xclient.message_type = otk::Property::atoms.net_active_window; ce.xclient.display = **otk::display; ce.xclient.window = c->window(); ce.xclient.format = 32;