Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Directly draw windows without forcing the system to send the -[NSView drawRect:] message

Browse Source 
because this slowed window drawing under Mac OS 10.10

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10777 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2015-06-28 19:28:23 +00:00
parent 2778ac6e45
commit a6b88e9191
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+17 -27
View File
@@ -89,7 +89,6 @@ static void cocoaMouseHandler(NSEvent *theEvent);
static void clipboard_check(void); static void clipboard_check(void);
static NSString *calc_utf8_format(void); static NSString *calc_utf8_format(void);
static unsigned make_current_counts = 0; // if > 0, then Fl_Window::make_current() can be called only once static unsigned make_current_counts = 0; // if > 0, then Fl_Window::make_current() can be called only once
static Fl_X *fl_x_to_redraw = NULL; // set by Fl_X::flush() to the Fl_X object of the window to be redrawn
static NSBitmapImageRep* rect_to_NSBitmapImageRep(Fl_Window *win, int x, int y, int w, int h); static NSBitmapImageRep* rect_to_NSBitmapImageRep(Fl_Window *win, int x, int y, int w, int h);
int fl_mac_os_version = Fl_X::calc_mac_os_version(); // the version number of the running Mac OS X (e.g., 100604 for 10.6.4) int fl_mac_os_version = Fl_X::calc_mac_os_version(); // the version number of the running Mac OS X (e.g., 100604 for 10.6.4)
@@ -2209,8 +2208,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
Fl_Window *w = [cw getFl_Window]; Fl_Window *w = [cw getFl_Window];
if (w->visible()) { if (w->visible()) {
through_drawRect = YES; through_drawRect = YES;
if (fl_x_to_redraw) fl_x_to_redraw->flush(); handleUpdateEvent(w);
else handleUpdateEvent(w);
through_drawRect = NO; through_drawRect = NO;
} }
fl_unlock_function(); fl_unlock_function();
@@ -2806,21 +2804,14 @@ void Fl_X::flush()
{ {
if (w->as_gl_window()) { if (w->as_gl_window()) {
w->flush(); w->flush();
return; } else {
} else if (through_drawRect) {
make_current_counts = 1; make_current_counts = 1;
if (!through_drawRect) [[xid contentView] lockFocus];
w->flush(); w->flush();
if (!through_drawRect) [[xid contentView] unlockFocus];
make_current_counts = 0; make_current_counts = 0;
Fl_X::q_release_context(); Fl_X::q_release_context();
return;
} }
// have Cocoa immediately redraw the window's view
FLView *view = (FLView*)[xid contentView];
fl_x_to_redraw = this;
[view setNeedsDisplay:YES];
// will send the drawRect: message to the window's view after having prepared the adequate NSGraphicsContext
[view displayIfNeededIgnoringOpacity];
fl_x_to_redraw = NULL;
} }
@@ -3246,24 +3237,23 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
This can be called in 3 different instances: This can be called in 3 different instances:
1) When a window is created or resized. 1) When a window is created or resized.
The system sends the drawRect: message to the window's view after having prepared the current graphics context The system sends the drawRect: message to the window's view after having prepared the current
to draw to this view. Variable through_drawRect is YES, and fl_x_to_redraw is NULL. Processing of drawRect: calls graphics context to draw to this view. Processing of drawRect: sets variable through_drawRect
handleUpdateEvent() that calls Fl_X::flush() for the window and its subwindows. Fl_X::flush() calls to YES and calls handleUpdateEvent() that calls Fl_X::flush(). Fl_X::flush() calls
Fl_Window::flush() that calls Fl_Window::make_current() that only needs to identify the graphics port of the Fl_Window::flush() that calls Fl_Window::make_current() that only needs to identify the graphics
current graphics context. The window's draw() function is then executed. port of the current graphics context. The window's draw() function is then executed.
2) At each round of the FLTK event loop. 2) At each round of the FLTK event loop.
Fl::flush() is called, that calls Fl_X::flush() on each window that needs drawing. Fl_X::flush() sets Fl::flush() is called, that calls Fl_X::flush() on each window that needs drawing. Variable
fl_x_to_redraw to this and sends the displayIfNeededIgnoringOpacity message to the window's view. through_drawRect is NO. Fl_X::flush() locks the focus to the view and calls Fl_Window::flush()
This message makes the system prepare the current graphics context adequately for drawing to this view, and that calls Fl_Window::make_current() which creates a new graphics context for the window.
send it the drawRect: message which sets through_drawRect to YES. Processing of the drawRect: message calls Fl_Window::flush() then runs the window's draw() function.
Fl_X::flush() for the window which proceeds as in 1) above.
3) An FLTK application can call Fl_Window::make_current() at any time before it draws to a window. 3) An FLTK application can call Fl_Window::make_current() at any time before it draws to a window.
This occurs for instance in the idle callback function of the mandelbrot test program. Variable through_drawRect is NO, This occurs for instance in the idle callback function of the mandelbrot test program. Variable
so Fl_Window::make_current() creates a new graphics context adequate for the window. through_drawRect is NO, so Fl_Window::make_current() creates a new graphics context adequate for
Subsequent drawing requests go to this window. CAUTION: it's not possible to call Fl::wait(), Fl::check() the window. Subsequent drawing requests go to this window. CAUTION: it's not possible to call Fl::wait(),
nor Fl::ready() while in the draw() function of a widget. Use an idle callback instead. Fl::check() nor Fl::ready() while in the draw() function of a widget. Use an idle callback instead.
*/ */
void Fl_Window::make_current() void Fl_Window::make_current()