X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.hh;h=45464e77e027e7ac890c4320cef54fc913dcc0c5;hb=dba5b809ec6f961324dbb5dff2dfc9c887958053;hp=f9dd54816557d18c223d922c7eb30476942fd2f3;hpb=5377e3fde108da56894185716d47c3058032b97f;p=chaz%2Fopenbox diff --git a/src/Toolbar.hh b/src/Toolbar.hh index f9dd5481..45464e77 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh @@ -90,7 +90,7 @@ private: Window window, workspace_label, window_label, clock, psbutton, nsbutton, pwbutton, nwbutton; - int x_hidden, y_hidden, hour, minute, grab_x, grab_y; + int x_hidden, y_hidden, hour, minute; unsigned int window_label_w, workspace_label_w, clock_w, button_w, bevel_w, label_h; @@ -118,6 +118,7 @@ private: friend class Toolbarmenu; friend class Toolbarmenu::Placementmenu; + void drawArrow(Drawable surface, bool left) const; void redrawPrevWorkspaceButton(bool pressed = False, bool redraw = False); void redrawNextWorkspaceButton(bool pressed = False, bool redraw = False); void redrawPrevWindowButton(bool preseed = False, bool redraw = False); @@ -172,12 +173,12 @@ public: inline int getY(void) const { return ((hidden) ? frame.y_hidden : frame.rect.y()); } - void buttonPressEvent(XButtonEvent *be); - void buttonReleaseEvent(XButtonEvent *re); - void enterNotifyEvent(XCrossingEvent * /*unused*/); - void leaveNotifyEvent(XCrossingEvent * /*unused*/); - void exposeEvent(XExposeEvent *ee); - void keyPressEvent(XKeyEvent *ke); + void buttonPressEvent(const XButtonEvent *be); + void buttonReleaseEvent(const XButtonEvent *re); + void enterNotifyEvent(const XCrossingEvent * /*unused*/); + void leaveNotifyEvent(const XCrossingEvent * /*unused*/); + void exposeEvent(const XExposeEvent *ee); + void keyPressEvent(const XKeyEvent *ke); void edit(void); void reconfigure(void);