nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added better shape support

Browse source
This commit is contained in:
fluxgen 2003-05-14 14:37:06 +00:00
parent 4195e26d01
commit 615ec14ab2
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fluxbox.cc
View file

@ -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: fluxbox.cc,v 1.146 2003/05/14 12:10:54 fluxgen Exp $ // $Id: fluxbox.cc,v 1.147 2003/05/14 14:37:06 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -454,6 +454,12 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
cursor.lr_angle = XCreateFontCursor(disp, XC_lr_angle); cursor.lr_angle = XCreateFontCursor(disp, XC_lr_angle);
s_singleton = this; s_singleton = this;
m_have_shape = false;
m_shape_eventbase = 0;
#ifdef SHAPE
int shape_err;
m_have_shape = XShapeQueryExtension(disp, &m_shape_eventbase, &shape_err);
#endif // SHAPE
#ifdef HAVE_RANDR #ifdef HAVE_RANDR
// get randr event type // get randr event type
@ -877,7 +883,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
BScreen *scr = searchScreen(e->xany.window); BScreen *scr = searchScreen(e->xany.window);
if (scr != 0) if (scr != 0)
scr->updateSize(); scr->updateSize();
} }
#endif // HAVE_RANDR #endif // HAVE_RANDR
} }

7
src/fluxbox.hh
View file

@ -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: fluxbox.hh,v 1.58 2003/05/13 00:18:28 fluxgen Exp $ // $Id: fluxbox.hh,v 1.59 2003/05/14 14:35:39 fluxgen Exp $
#ifndef FLUXBOX_HH #ifndef FLUXBOX_HH
#define FLUXBOX_HH #define FLUXBOX_HH
@ -189,7 +189,8 @@ public:
typedef std::vector<Fluxbox::Titlebar> TitlebarList; typedef std::vector<Fluxbox::Titlebar> TitlebarList;
/// @return whether the timestamps on the menu changed /// @return whether the timestamps on the menu changed
bool menuTimestampsChanged() const; bool menuTimestampsChanged() const;
bool haveShape() const { return m_have_shape; }
int shapeEventbase() const { return m_shape_eventbase; }
private: private:
struct cursor { struct cursor {
Cursor session, move, ll_angle, lr_angle; Cursor session, move, ll_angle, lr_angle;
@ -273,6 +274,8 @@ private:
bool m_shutdown; bool m_shutdown;
int m_server_grabs; int m_server_grabs;
int m_randr_event_type; ///< the type number of randr event int m_randr_event_type; ///< the type number of randr event
int m_shape_eventbase; ///< event base for shape events
bool m_have_shape; ///< if shape is supported by server
const char *m_RC_PATH; const char *m_RC_PATH;
const char *m_RC_INIT_FILE; const char *m_RC_INIT_FILE;
}; };