Windows OpenGL workaround

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 9a4f5948075ee65da555ac4679628b6f551aef6e..88101ab1ac18022968a9a9840898f9287698453d 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,19 +1,12 @@
 + 0.85:
 
-- doc sweep
-- the editor should fill up the interior of the scroller completely
-- pane output in UI should use less memory
 - signal 4 on datastack underflow on mac intel??
 - test alien-indirect
-- buffer-ptr should be an alien
-- fix this:
-  [ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 ] .
-[ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 
-]
-- prettier printing of hashtable literals, alists, cond, ...
-- more compact relocation info
-- problem if major gc happens during relocation
-  - in fact relocation should not cons at all
+
++ ui:
+
+- the editor should fill up the interior of the scroller completely
+- pane output in UI should use less memory
 - variable width word wrap
   - needs layout tricks
 - add-gadget, model-changed, set-model should compile
@@ -27,12 +20,8 @@
   - more efficient multi-line inserts
   - write "foo| " and put caret at | then select word element: selects
     space
-- we have trouble drawing rectangles
 - ui browser: show currently selected vocab & words
   - keyboard-navigatable list gadget of some kind
-
-+ ui:
-
 - tuple= in dataflow view
 - hide empty command groups in $commands
 - ui quick start doc
@@ -93,6 +82,9 @@
 
 + compiler/ffi:
 
+- more compact relocation info
+- problem if major gc happens during relocation
+  - in fact relocation should not cons at all
 - stdcall callbacks
 - see if alien calls can be made faster
 - compiler tests are not as reliable now because of try-compile usage
@@ -117,7 +109,12 @@
 
 + misc:
 
-- slot accessors should record their loc
+- fix this:
+  [ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 ] .
+[ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 
+]
+- prettier printing of hashtable literals, alists, cond, ...
+- buffer-ptr should be an alien
 - swap nappend ==> nappend
 - sometimes darcs get fails with the httpd
 - gdb triggers 'mutliple i/o ops on port' error

diff --git a/library/test/tuple.factor b/library/test/tuple.factor
index de5d5794984931cb242fe320bbfb5710419600d9..04473d25616ebb1fbe4512e0d5a796b1fcf7c5e4 100644 (file)
--- a/library/test/tuple.factor
+++ b/library/test/tuple.factor
@@ -133,3 +133,9 @@ TUPLE: yo-momma ;
 [ ] [ "IN: temporary TUPLE: C:-test ; C: C:-test ( -- x ) ;" eval ] unit-test
 [ "<C:-test>" ] [ word word-name ] unit-test
 [ "( -- x )" ] [ "<C:-test>" "temporary" lookup stack-effect effect>string ] unit-test
+
+TUPLE: loc-recording ;
+
+[ f ] [ \ loc-recording where not ] unit-test
+[ f ] [ \ <loc-recording> where not ] unit-test
+[ f ] [ \ loc-recording? where not ] unit-test

diff --git a/library/ui/opengl/opengl-utils.factor b/library/ui/opengl/opengl-utils.factor
index c76be2c583ddf12087fb80b320365c4949a79fc0..db4e99183e33a900ec1b0819ab4fce6915721eba 100644 (file)
--- a/library/ui/opengl/opengl-utils.factor
+++ b/library/ui/opengl/opengl-utils.factor
@@ -43,10 +43,12 @@ sequences ;
 
 : gl-rect ( dim -- )
     #! Draws a two-dimensional box.
+    GL_FRONT_AND_BACK GL_LINE glPolygonMode
     GL_MODELVIEW [
         0.5 0.5 0.0 glTranslated { 1 1 } v-
-        GL_LINE_STRIP [ dup four-sides top-left ] do-state
-    ] do-matrix ;
+        GL_QUADS [ dup four-sides top-left ] do-state
+    ] do-matrix
+    GL_FRONT_AND_BACK GL_FILL glPolygonMode ;
 
 : (gl-poly) [ [ gl-vertex ] each ] do-state ;