projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new/reworked audio plugins ported from hv72 compressor/multi/reverb, glyph workaround...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
bcwindowbase.h
diff --git
a/cinelerra-5.1/guicast/bcwindowbase.h
b/cinelerra-5.1/guicast/bcwindowbase.h
index f231c6d20a68da704ed3b8acf103ff5362137673..153aab37ab354fd80aded0cbc98db4e25fa9d94c 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowbase.h
+++ b/
cinelerra-5.1/guicast/bcwindowbase.h
@@
-97,7
+97,9
@@
#include <GL/glx.h>
#endif
#include <GL/glx.h>
#endif
-
+// scaled x,y unit
+#define xS(v) (BC_WindowBase::get_resources()->x_scale*(v))
+#define yS(v) (BC_WindowBase::get_resources()->y_scale*(v))
#ifdef HAVE_GL
//typedef void* GLXContext;
#ifdef HAVE_GL
//typedef void* GLXContext;
@@
-201,6
+203,8
@@
public:
virtual int grab_event(XEvent *event) { return 0; };
virtual void create_objects() { return; };
virtual int grab_event(XEvent *event) { return 0; };
virtual void create_objects() { return; };
+ static void init_resources(float scale);
+ static void finit_resources();
int get_window_type() { return window_type; }
// Wait until event loop is running
void init_wait();
int get_window_type() { return window_type; }
// Wait until event loop is running
void init_wait();
@@
-572,6
+576,7
@@
private:
int allocate_color_table();
int init_gc();
int init_fonts();
int allocate_color_table();
int init_gc();
int init_fonts();
+ void init_glyphs();
void init_xft();
void init_im();
void finit_im();
void init_xft();
void init_im();
void finit_im();
@@
-727,7
+732,7
@@
private:
// Whether the window has the focus
int has_focus;
// Whether the window has the focus
int has_focus;
- static BC_Resources resources;
+ static BC_Resources
*
resources;
#ifndef SINGLE_THREAD
// Array of repeaters for multiple repeating objects.
#ifndef SINGLE_THREAD
// Array of repeaters for multiple repeating objects.