summaryrefslogtreecommitdiff
path: root/src/BaseDisplay.hh
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-07-21 09:56:18 +0000
committerDana Jansens <danakj@orodu.net>2002-07-21 09:56:18 +0000
commitbd7f9481590d79ba81c03d3d22ba190826921194 (patch)
tree23cd71e4da31c532f06ada5f93489c5f96cc3af2 /src/BaseDisplay.hh
parent54c495c83cf5595db4c6a367386d3ef35bc94fca (diff)
sync with bb-cvs.
Add option in config menu for disabling mouse input with scroll lock. Remove compile-time flag for event clobbering since this solves that problem for now.
Diffstat (limited to 'src/BaseDisplay.hh')
-rw-r--r--src/BaseDisplay.hh5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 921f6ecd..3ebe6e61 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -77,10 +77,8 @@ private:
};
BShape shape;
-#ifndef NOCLOBBER
unsigned int MaskList[8];
size_t MaskListLength;
-#endif // NOCLOBBER
enum RunState { STARTUP, RUNNING, SHUTDOWN };
RunState run_state;
@@ -139,7 +137,8 @@ public:
void grabButton(unsigned int button, unsigned int modifiers,
Window grab_window, bool owner_events,
unsigned int event_mask, int pointer_mode,
- int keyboard_mode, Window confine_to, Cursor cursor) const;
+ int keyboard_mode, Window confine_to, Cursor cursor,
+ bool allow_scroll_lock) const;
void ungrabButton(unsigned int button, unsigned int modifiers,
Window grab_window) const;