projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcwindowbase.h
diff --git
a/cinelerra-5.1/guicast/bcwindowbase.h
b/cinelerra-5.1/guicast/bcwindowbase.h
index 3029e16ea6440d068061ab96a4b273d55534be47..5d17e5ee3064362c2cc23e73d3b11c91b1f2e1ad 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowbase.h
+++ b/
cinelerra-5.1/guicast/bcwindowbase.h
@@
-129,7
+129,7
@@
public:
class BC_WindowBase : public trace_info
{
public:
class BC_WindowBase : public trace_info
{
public:
- BC_WindowBase(
int opts=0
);
+ BC_WindowBase();
virtual ~BC_WindowBase();
friend class BC_Bar;
virtual ~BC_WindowBase();
friend class BC_Bar;
@@
-224,7
+224,6
@@
public:
int get_deleting();
int get_deleting();
-
//============================= OpenGL functions ===============================
// OpenGL functions must be called from inside a BC_Synchronous command.
// Create openGL context and bind it to the current window.
//============================= OpenGL functions ===============================
// OpenGL functions must be called from inside a BC_Synchronous command.
// Create openGL context and bind it to the current window.
@@
-269,6
+268,7
@@
public:
virtual int keyboard_listener(BC_WindowBase *wp) { return 0; }
void add_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
void del_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
virtual int keyboard_listener(BC_WindowBase *wp) { return 0; }
void add_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
void del_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
+ int resend_event(BC_WindowBase *window);
// Dimensions
virtual int get_w() { return w; }
virtual int get_h() { return h; }
// Dimensions
virtual int get_w() { return w; }
virtual int get_h() { return h; }
@@
-282,13
+282,13
@@
public:
int get_screen_x(int lock_display, int screen);
int get_screen_y(int lock_display, int screen);
// Get current position
int get_screen_x(int lock_display, int screen);
int get_screen_y(int lock_display, int screen);
// Get current position
- void get_abs_cursor
_xy
(int &abs_x, int &abs_y, int lock_window=0);
+ void get_abs_cursor(int &abs_x, int &abs_y, int lock_window=0);
int get_abs_cursor_x(int lock_window=0);
int get_abs_cursor_y(int lock_window=0);
int get_abs_cursor_x(int lock_window=0);
int get_abs_cursor_y(int lock_window=0);
- void get_pop_cursor
_xy
(int &px, int &py, int lock_window=0);
+ void get_pop_cursor(int &px, int &py, int lock_window=0);
int get_pop_cursor_x(int lock_window=0);
int get_pop_cursor_y(int lock_window=0);
int get_pop_cursor_x(int lock_window=0);
int get_pop_cursor_y(int lock_window=0);
- void get_relative_cursor
_xy
(int &x, int &y, int lock_window=0);
+ void get_relative_cursor(int &x, int &y, int lock_window=0);
int get_relative_cursor_x(int lock_window=0);
int get_relative_cursor_y(int lock_window=0);
void get_root_coordinates(int x, int y, int *abs_x, int *abs_y);
int get_relative_cursor_x(int lock_window=0);
int get_relative_cursor_y(int lock_window=0);
void get_root_coordinates(int x, int y, int *abs_x, int *abs_y);
@@
-461,6
+461,7
@@
public:
// Reroute toplevel events
int grab(BC_WindowBase *window);
int ungrab(BC_WindowBase *window);
// Reroute toplevel events
int grab(BC_WindowBase *window);
int ungrab(BC_WindowBase *window);
+ int grab_event_count();
// Grab button events
int grab_buttons();
void ungrab_buttons();
// Grab button events
int grab_buttons();
void ungrab_buttons();
@@
-657,6
+658,8
@@
private:
BC_PopupMenu* active_popup_menu;
// pointer to the active subwindow
BC_WindowBase* active_subwindow;
BC_PopupMenu* active_popup_menu;
// pointer to the active subwindow
BC_WindowBase* active_subwindow;
+// pointer to the window to which to put the current event
+ BC_WindowBase* resend_event_window;
// thread id of display locker
pthread_t display_lock_owner;
// thread id of display locker
pthread_t display_lock_owner;
@@
-674,6
+677,8
@@
private:
int video_on;
// Event handler completion
int done, done_set, window_running;
int video_on;
// Event handler completion
int done, done_set, window_running;
+// Enter/Leave notify state
+ int cursor_entered;
// Return value of event handler
int return_value;
// Motion event compression
// Return value of event handler
int return_value;
// Motion event compression
@@
-736,24
+741,21
@@
private:
// Popup window for tooltip
BC_Popup *tooltip_popup;
// If this subwindow has already shown a tooltip since the last EnterNotify
// Popup window for tooltip
BC_Popup *tooltip_popup;
// If this subwindow has already shown a tooltip since the last EnterNotify
- int options;
int flash_enabled;
// Font sets
int flash_enabled;
// Font sets
-
XFontSet smallfontset, mediumfontset, largefontset, bigfontset, curr_
fontset;
-
+
XFontSet smallfontset, mediumfontset, largefontset, bigfontset, clock
fontset;
+ XFontSet curr_fontset;
// Fonts
int current_font;
// Fonts
int current_font;
- XFontStruct *smallfont, *mediumfont, *largefont, *bigfont;
-
+ XFontStruct *smallfont, *mediumfont, *largefont, *bigfont, *clockfont;
// Must be void so users don't need to include the wrong libpng version.
// Must be void so users don't need to include the wrong libpng version.
- void *smallfont_xft, *mediumfont_xft, *largefont_xft, *bigfont_xft;
-
+ void *smallfont_xft, *mediumfont_xft, *largefont_xft, *bigfont_xft
, *clockfont_xft
;
+ void *bold_smallfont_xft, *bold_mediumfont_xft, *bold_largefont_xft;
int line_width;
int line_dashes;
int line_width;
int line_dashes;
- void *bold_largefont_xft, *bold_mediumfont_xft, *bold_smallfont_xft;
int64_t current_color;
// Coordinate of drag start
int drag_x, drag_y;
int64_t current_color;
// Coordinate of drag start
int drag_x, drag_y;