Skip to content

Fix GTK collecting blit window cleanup #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samth wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −12
Open

Fix GTK collecting blit window cleanup #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gui-lib/mred/private/wx/gtk/gcwin.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
(define-gdk gdk_display_flush _fpointer)

(define-gdk gdk_window_show (_fun _GdkWindow -> _void))
(define-gdk gdk_window_destroy (_fun _GdkWindow -> _void))

;; Gtk2
(define-gdk gdk_draw_pixbuf _fpointer
Expand Down Expand Up @@ -161,7 +162,7 @@
(define (free-gc-window win)
(cond
[use-x11? (XDestroyWindow (car win) (cdr win))]
[else (g_object_unref win)]))
[else (gdk_window_destroy win)]))

(define (make-draw win gc-bitmap w h)
(cond
Expand Down
25 changes: 14 additions & 11 deletions gui-test/tests/gracket/gc-blits.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@
(define off (make-bitmap w h))
(send (send on make-dc) draw-rectangle 5 5 (- w 10) (- h 10))

(send
(for/fold ([prev-f #f]) ([i (in-range 10)])
(define f (new frame% [label "GC Blit"] [width 100] [height 100]))
(define c (new canvas% [parent f]))
(register-collecting-blit c 0 0 w h on off)
(send f show #t)
(collect-garbage)
(yield (system-idle-evt))
(when prev-f (send prev-f show #f))
f)
show #f)
(define final
(for/fold ([prev #f]) ([i (in-range 10)])
(define f (new frame% [label "GC Blit"] [width 100] [height 100]))
(define c (new canvas% [parent f]))
(register-collecting-blit c 0 0 w h on off)
(send f show #t)
(collect-garbage)
(yield (system-idle-evt))
(when prev
(unregister-collecting-blit (cdr prev))
(send (car prev) show #f))
(cons f c)))

(unregister-collecting-blit (cdr final))
(send (car final) show #f)
Loading