minor fixes
This commit is contained in:
parent
bb004b6325
commit
4223370926
2 changed files with 6 additions and 7 deletions
|
@ -22,12 +22,12 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Window.cc,v 1.189 2003/06/11 14:51:56 fluxgen Exp $
|
// $Id: Window.cc,v 1.190 2003/06/12 14:35:36 fluxgen Exp $
|
||||||
|
|
||||||
#include "Window.hh"
|
#include "Window.hh"
|
||||||
|
|
||||||
#include "WinClient.hh"
|
#include "WinClient.hh"
|
||||||
#include "i18n.hh"
|
#include "I18n.hh"
|
||||||
#include "fluxbox.hh"
|
#include "fluxbox.hh"
|
||||||
#include "Screen.hh"
|
#include "Screen.hh"
|
||||||
#include "StringUtil.hh"
|
#include "StringUtil.hh"
|
||||||
|
@ -814,7 +814,6 @@ void FluxboxWindow::associateClientWindow() {
|
||||||
|
|
||||||
|
|
||||||
void FluxboxWindow::grabButtons() {
|
void FluxboxWindow::grabButtons() {
|
||||||
Fluxbox *fluxbox = Fluxbox::instance();
|
|
||||||
|
|
||||||
XGrabButton(display, Button1, AnyModifier,
|
XGrabButton(display, Button1, AnyModifier,
|
||||||
frame().clientArea().window(), True, ButtonPressMask,
|
frame().clientArea().window(), True, ButtonPressMask,
|
||||||
|
@ -2968,7 +2967,7 @@ void FluxboxWindow::doSnapping(int &orig_left, int &orig_top) {
|
||||||
|
|
||||||
void FluxboxWindow::startResizing(Window win, int x, int y, bool left) {
|
void FluxboxWindow::startResizing(Window win, int x, int y, bool left) {
|
||||||
resizing = true;
|
resizing = true;
|
||||||
Fluxbox *fluxbox = Fluxbox::instance();
|
|
||||||
XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask,
|
XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask,
|
||||||
GrabModeAsync, GrabModeAsync, None,
|
GrabModeAsync, GrabModeAsync, None,
|
||||||
(left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()),
|
(left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()),
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Window.hh,v 1.76 2003/05/26 04:24:24 rathnor Exp $
|
// $Id: Window.hh,v 1.77 2003/06/12 14:34:28 fluxgen Exp $
|
||||||
|
|
||||||
#ifndef WINDOW_HH
|
#ifndef WINDOW_HH
|
||||||
#define WINDOW_HH
|
#define WINDOW_HH
|
||||||
|
@ -346,6 +346,7 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void init();
|
void init();
|
||||||
|
/// applies a shape mask to the window if it has one
|
||||||
void shape();
|
void shape();
|
||||||
|
|
||||||
void grabButtons();
|
void grabButtons();
|
||||||
|
@ -371,8 +372,6 @@ private:
|
||||||
void saveBlackboxHints();
|
void saveBlackboxHints();
|
||||||
void setNetWMAttributes();
|
void setNetWMAttributes();
|
||||||
void associateClientWindow();
|
void associateClientWindow();
|
||||||
void createWinButtons();
|
|
||||||
void decorateLabel();
|
|
||||||
|
|
||||||
void restoreGravity();
|
void restoreGravity();
|
||||||
void setGravityOffsets();
|
void setGravityOffsets();
|
||||||
|
@ -396,6 +395,7 @@ private:
|
||||||
// Window states
|
// Window states
|
||||||
bool moving, resizing, shaded, maximized, iconic,
|
bool moving, resizing, shaded, maximized, iconic,
|
||||||
focused, stuck, send_focus_message, m_managed;
|
focused, stuck, send_focus_message, m_managed;
|
||||||
|
|
||||||
WinClient *m_attaching_tab;
|
WinClient *m_attaching_tab;
|
||||||
|
|
||||||
BScreen &m_screen; /// screen on which this window exist
|
BScreen &m_screen; /// screen on which this window exist
|
||||||
|
|
Loading…
Reference in a new issue