X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWindow.hh;h=b923c4bfe14f8a597ab87cee2246142eb18d0778;hb=8b55442b2e0893f3064e88c4372bd0ecf00ba830;hp=02c15bcbf480cbd788fd4f5f4ddccbd262e6f16d;hpb=d7a655137bdb7f02cb79714e7d92aa0c26a55520;p=chaz%2Fopenbox diff --git a/src/Window.hh b/src/Window.hh index 02c15bcb..b923c4bf 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -217,20 +217,20 @@ private: */ struct _frame { - // u -> unfocused, f -> has focus + // u -> unfocused, f -> has focus, p -> pressed unsigned long ulabel_pixel, flabel_pixel, utitle_pixel, ftitle_pixel, uhandle_pixel, fhandle_pixel, ubutton_pixel, - fbutton_pixel, pbutton_pixel, uborder_pixel, fborder_pixel, - ugrip_pixel, fgrip_pixel; + fbutton_pixel, pfbutton_pixel, pubutton_pixel, + uborder_pixel, fborder_pixel, ugrip_pixel, fgrip_pixel; Pixmap ulabel, flabel, utitle, ftitle, uhandle, fhandle, - ubutton, fbutton, pbutton, ugrip, fgrip; + ubutton, fbutton, pfbutton, pubutton, ugrip, fgrip; Window window, // the frame plate, // holds the client title, label, handle, - close_button, iconify_button, maximize_button, + close_button, iconify_button, maximize_button, stick_button, right_grip, left_grip; /* @@ -255,7 +255,8 @@ private: bool getState(void); Window createToplevelWindow(); - Window createChildWindow(Window parent, Cursor = None); + Window createChildWindow(Window parent, unsigned long event_mask, + Cursor = None); bool getWindowType(void); void updateStrut(void); @@ -284,12 +285,20 @@ private: void destroyIconifyButton(void); void createMaximizeButton(void); void destroyMaximizeButton(void); + void createStickyButton(void); + void destroyStickyButton(void); void redrawWindowFrame(void) const; void redrawLabel(void) const; void redrawAllButtons(void) const; + void BlackboxWindow::redrawButton(bool pressed, Window win, + Pixmap fppix, unsigned long fppixel, + Pixmap uppix, unsigned long uppixel, + Pixmap fpix, unsigned long fpixel, + Pixmap upix, unsigned long upixel) const; void redrawCloseButton(bool pressed) const; void redrawIconifyButton(bool pressed) const; void redrawMaximizeButton(bool pressed) const; + void redrawStickyButton(bool pressed) const; void applyGravity(Rect &r); void restoreGravity(Rect &r); void setAllowedActions(void); @@ -416,6 +425,7 @@ public: #ifdef SHAPE void configureShape(void); + void clearShape(void); void shapeEvent(XShapeEvent * /*unused*/); #endif // SHAPE