projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework intl strategy, titler upgrades, fonts fixes, igor ru.po
[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 cd4ba72905945122329dcc07d585253e4af1cd6b..d06f062d8051d362b5f44ac959a47ffc96c53ff0 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowbase.h
+++ b/
cinelerra-5.1/guicast/bcwindowbase.h
@@
-93,6
+93,7
@@
#endif
#include <X11/extensions/Xinerama.h>
#ifdef HAVE_GL
#endif
#include <X11/extensions/Xinerama.h>
#ifdef HAVE_GL
+#define GL_GLEXT_PROTOTYPES
#include <GL/glx.h>
#endif
#include <GL/glx.h>
#endif
@@
-268,10
+269,10
@@
public:
void add_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
void del_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
// Dimensions
void add_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
void del_keyboard_listener(int(BC_WindowBase::*handler)(BC_WindowBase *));
// Dimensions
- virtual int get_w()
;
- virtual int get_h()
;
- virtual int get_x()
;
- virtual int get_y()
;
+ virtual int get_w()
{ return w; }
+ virtual int get_h()
{ return h; }
+ virtual int get_x()
{ return x; }
+ virtual int get_y()
{ return y; }
int get_root_w(int lock_display);
int get_root_h(int lock_display);
XineramaScreenInfo *get_xinerama_info(int screen);
int get_root_w(int lock_display);
int get_root_h(int lock_display);
XineramaScreenInfo *get_xinerama_info(int screen);
@@
-460,6
+461,11
@@
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);
+// Grab button events
+ int grab_buttons();
+ void ungrab_buttons();
+ void grab_cursor();
+ void ungrab_cursor();
// Get a bitmap to draw on the window with
BC_Bitmap* new_bitmap(int w, int h, int color_model = -1);
// Draw a bitmap on the window
// Get a bitmap to draw on the window with
BC_Bitmap* new_bitmap(int w, int h, int color_model = -1);
// Draw a bitmap on the window
@@
-508,7
+514,8
@@
public:
int unset_repeat(int64_t duration);
const char *get_tooltip();
int set_tooltip(const char *text);
int unset_repeat(int64_t duration);
const char *get_tooltip();
int set_tooltip(const char *text);
- int show_tooltip(int w = -1, int h = -1);
+ virtual int show_tooltip(const char *text, int x=-1, int y=-1, int w = -1, int h = -1);
+ int show_tooltip(int w=-1, int h=-1) { return show_tooltip(0, -1, -1, w, h); }
int hide_tooltip();
int set_icon(VFrame *data);
int load_defaults(BC_Hash *defaults);
int hide_tooltip();
int set_icon(VFrame *data);
int load_defaults(BC_Hash *defaults);
@@
-550,6
+557,7
@@
private:
int create_private_colors();
int create_color(int color);
int create_shared_colors();
int create_private_colors();
int create_color(int color);
int create_shared_colors();
+ Cursor create_grab_cursor();
// Get width of a single line. Used by get_text_width
int get_single_text_width(int font, const char *text, int length);
int get_single_text_width(int font, const wchar_t *text, int length);
// Get width of a single line. Used by get_text_width
int get_single_text_width(int font, const char *text, int length);
int get_single_text_width(int font, const wchar_t *text, int length);
@@
-576,7
+584,7
@@
private:
int trigger_tooltip();
int untrigger_tooltip();
int trigger_tooltip();
int untrigger_tooltip();
- void draw_tooltip();
+ void draw_tooltip(
const char *text=0
);
static XEvent *new_xevent();
// delete all repeater opjects for a close
int unset_all_repeaters();
static XEvent *new_xevent();
// delete all repeater opjects for a close
int unset_all_repeaters();
@@
-637,7
+645,7
@@
private:
// Type of window defined above
int window_type;
// keypress/pointer active grab
// Type of window defined above
int window_type;
// keypress/pointer active grab
- BC_WindowBase
* active_grab
;
+ BC_WindowBase
*active_grab, *grab_active
;
// Pointer to the active menubar in the window.
BC_MenuBar* active_menubar;
// pointer to the active popup menu in the window
// Pointer to the active menubar in the window.
BC_MenuBar* active_menubar;
// pointer to the active popup menu in the window
@@
-723,7
+731,6
@@
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 tooltip_done;
int options;
int flash_enabled;
int options;
int flash_enabled;
@@
-827,6
+834,7
@@
private:
Cursor downright_resize_cursor;
Cursor hourglass_cursor;
Cursor transparent_cursor;
Cursor downright_resize_cursor;
Cursor hourglass_cursor;
Cursor transparent_cursor;
+ Cursor grabbed_cursor;
int xvideo_port_id;
ArrayList<BC_ResizeCall*> resize_history;
int xvideo_port_id;
ArrayList<BC_ResizeCall*> resize_history;