*** empty log message ***

* empty log message *
Alain Prouté
1 parent 23cbfe02
Showing 8 changed files with 97 additions and 36 deletions Show diff stats
anubis_dev/compiler/src/predef.aux
anubis_dev/include/bytecode.h
anubis_dev/library/examples/try_window.anubis
anubis_dev/library/predefined.anubis
anubis_dev/vm/src/host_graph.h
anubis_dev/vm/src/linux/host_graph.c
anubis_dev/vm/src/syscalls.c
anubis_dev/vm/src/win32/host_graph.c
@@ -4057,7 +4057,20 @@ new_string(&quot;hw&quot;)),
 nil),
 no_term);
-new_op_scheme(18794524,1,
+new_op_scheme(18795036,1,
+new_string("One"),
+cons(new_string("resize"),
+nil),
+cons(cons(new_string("HostWindow"),
+new_string("hw")),
+cons(cons(type_Int32,
+new_string("width")),
+cons(cons(type_Int32,
+new_string("height")),
+nil))),
+no_term);
+
+new_op_scheme(18801692,1,
 cons(app_ts,
 cons(new_string("£Tuple2"),
 cons(type_Int32,
@@ -4068,7 +4081,7 @@ nil),
 nil,
 no_term);
-new_op_scheme(18798620,1,
+new_op_scheme(18805788,1,
 new_string("One"),
 cons(new_string("change_title"),
 nil),
@@ -4079,7 +4092,7 @@ new_string(&quot;new_title&quot;)),
 nil)),
 no_term);
-new_op_scheme(18807822,0,
+new_op_scheme(18813966,0,
 new_string("Bool"),
 cons(new_string("£window_event_pending"),
 nil),
@@ -4089,7 +4102,7 @@ new_string(&quot;handle&quot;)),
 nil),
 no_term);
-new_op_scheme(18813454,0,
+new_op_scheme(18819598,0,
 cons(app_ts,
 cons(new_string("HostWindowEvent"),
 cons(new_utvar("E"),
@@ -4102,7 +4115,7 @@ new_string(&quot;handle&quot;)),
 nil),
 no_term);
-new_op_scheme(18821134,0,
+new_op_scheme(18827278,0,
 cons(app_ts,
 cons(new_string("List"),
 cons(cons(app_ts,
@@ -4118,7 +4131,7 @@ new_string(&quot;handle&quot;)),
 nil),
 no_term);
-new_op_scheme(18829326,0,
+new_op_scheme(18835470,0,
 new_string("Bool"),
 cons(new_string("£default_host_window_handling"),
 nil),
@@ -4161,7 +4174,7 @@ new_string(&quot;event_handler&quot;)),
 nil))))),
 no_term);
-new_op_scheme(18835982,0,
+new_op_scheme(18842126,0,
 new_string("One"),
 cons(new_string("£begin_paint"),
 nil),
@@ -4170,7 +4183,7 @@ new_string(&quot;window&quot;)),
 nil),
 no_term);
-new_op_scheme(18839566,0,
+new_op_scheme(18845710,0,
 new_string("One"),
 cons(new_string("£end_paint"),
 nil),
@@ -4179,7 +4192,7 @@ new_string(&quot;window&quot;)),
 nil),
 no_term);
-new_op_scheme(18843662,0,
+new_op_scheme(18849806,0,
 new_string("Bool"),
 cons(new_string("£handle_host_window_events"),
 nil),
@@ -4217,7 +4230,7 @@ new_string(&quot;eh&quot;)),
 nil)))),
 no_term);
-new_op_scheme(18860558,0,
+new_op_scheme(18866702,0,
 new_string("Bool"),
 cons(new_string("£default_host_window_handling"),
 nil),
@@ -4260,7 +4273,7 @@ new_string(&quot;event_handler&quot;)),
 nil))))),
 no_term);
-new_op_scheme(18871836,1,
+new_op_scheme(18877980,1,
 new_string("One"),
 cons(new_string("generic_host_window_handler"),
 nil),
@@ -4318,7 +4331,7 @@ nil),
 nil),
 nil)),0,1);
-new_op_scheme(18887182,0,
+new_op_scheme(18893326,0,
 cons(app_ts,
 cons(new_string("Maybe"),
 cons(cons(app_ts,
@@ -4346,7 +4359,7 @@ new_string(&quot;sort&quot;)),
 nil)))))),
 no_term);
-new_op_scheme(18895388,1,
+new_op_scheme(18901532,1,
 cons(app_ts,
 cons(new_string("Maybe"),
 cons(new_string("HostWindow"),
@@ -4400,7 +4413,7 @@ new_string(&quot;compress&quot;)),
 nil)))))),
 no_term);
-new_op_scheme(18911772,1,
+new_op_scheme(18917916,1,
 new_string("One"),
 cons(new_string("show"),
 nil),
@@ -4409,7 +4422,7 @@ new_string(&quot;win&quot;)),
 nil),
 no_term);
-new_op_scheme(18915868,1,
+new_op_scheme(18922012,1,
 new_string("One"),
 cons(new_string("hide"),
 nil),
@@ -4418,7 +4431,7 @@ new_string(&quot;win&quot;)),
 nil),
 no_term);
-new_op_scheme(18925596,1,
+new_op_scheme(18931740,1,
 new_string("Bool"),
 cons(new_string("queue_event"),
 nil),
@@ -4432,7 +4445,7 @@ new_string(&quot;e&quot;)),
 nil)),
 no_term);
-new_op_scheme(18935836,1,
+new_op_scheme(18941980,1,
 new_string("One"),
 cons(new_string("paint_rectangle"),
 nil),
@@ -4445,7 +4458,7 @@ new_string(&quot;color&quot;)),
 nil))),
 no_term);
-new_op_scheme(18941468,1,
+new_op_scheme(18947612,1,
 new_string("One"),
 cons(new_string("paint_rectangle"),
 nil),
@@ -4458,7 +4471,7 @@ new_string(&quot;color&quot;)),
 nil))),
 no_term);
-new_op_scheme(18958876,1,
+new_op_scheme(18965020,1,
 new_string("One"),
 cons(new_string("paint_image"),
 nil),
@@ -4475,7 +4488,7 @@ new_string(&quot;image&quot;)),
 nil))))),
 no_term);
-new_op_scheme(18965532,1,
+new_op_scheme(18971676,1,
 new_string("One"),
 cons(new_string("paint_image"),
 nil),
@@ -4492,7 +4505,7 @@ new_string(&quot;image&quot;)),
 nil))))),
 no_term);
-new_op_scheme(18971676,1,
+new_op_scheme(18977820,1,
 new_string("One"),
 cons(new_string("map_to_host_window"),
 nil),
@@ -470,6 +470,8 @@ typedef enum {
   sc_item(will_restart,0)\
   sc_item(do_execute_capture,0)\
   sc_item(check_execute_status,0)\
+  sc_item(resize_host_window,mf_using_graphism)\
+   
@@ -11,13 +11,13 @@ define One
    paint_method
      (
        HostWindow window, 
-       Rectangle  r
+       List(Rectangle) rs
      ) =
-	print("Painting\n");
-   paint_rectangle(window,r,rgb(128,128,128));
-   paint_rectangle(window,rect(10,10,50,50),rgb(255,0,0));
-   paint_rectangle(window,rect(60,10,100,50),rgb(0,255,0)); 
-   paint_rectangle(window,rect(110,10,150,50),rgb(0,0,255)). 
+   forget(map((Rectangle r) |-> 
+     paint_rectangle(window,r,rgb(128,128,128));
+     paint_rectangle(window,rect(10,10,50,50),rgb(255,0,0));
+     paint_rectangle(window,rect(60,10,100,50),rgb(0,255,0)); 
+     paint_rectangle(window,rect(110,10,150,50),rgb(0,0,255)),rs)). 
@@ -3935,8 +3935,22 @@ public define (Int32,Int32)
      ) = £avm{ host_window_size }.
-   The size (width,height) of the screen itself (in pixels) is returned by:
+   You can change the size of the window:
+   
+public define One
+   resize
+     (
+       HostWindow  hw, 
+       Int32       width, 
+       Int32       height
+     ) =
+   £avm{ resize_host_window }.
+   
+   
+   
+   The size (width,height) of the screen itself (in pixels) is returned by:
+ 
 public define (Int32,Int32)
    screen_size
      =
@@ -3954,8 +3968,6 @@ public define One
- 
-   
       *** (11.3) Generic host window handler. 
@@ -50,6 +50,7 @@ U8		host_translate_keyboard_state(unsigned int state);
 void	host_sc_screen_size(int *witdh, int *height);
 BOOL	host_sc_open_host_window(U32 xWin, U32 yWin, U32 wWin, U32 hWin, char * title, BOOL transcientFlag, U32 *the_window, U32 *the_gc);
 void	host_sc_host_window_size(U32 handle, int * wSize, int * hSize);
+void    host_sc_resize_host_window(U32 handle, int width, int height);    
 void  host_free_host_window(U32 winPointer);
 void  host_free_host_pixmap(U32 pixPointer);
@@ -71,7 +71,9 @@ BOOL host_sc_open_host_window(U32 xPos, U32 yPos, U32 wSize, U32 hSize,
   the_hints.height = hSize;
   the_hints.flags = PPosition | PSize; 
-	xswa.override_redirect = transcientFlag;
+  xswa.override_redirect = transcientFlag;
+  xswa.background_pixmap = None; 
+   
   /* Create the (not yet mapped to screen) window. */
   *the_window = (U32)XCreateSimpleWindow(the_display,
@@ -93,7 +95,7 @@ BOOL host_sc_open_host_window(U32 xPos, U32 yPos, U32 wSize, U32 hSize,
 	XChangeWindowAttributes(the_display,
                               *the_window,
-                              CWOverrideRedirect,
+                              CWOverrideRedirect|CWBackPixmap,
                               &xswa); 
@@ -173,6 +175,13 @@ void host_change_host_window_title(U32 the_window, char * title)
   XStoreName(the_display,(Window)the_window,title); 
 }
+void host_sc_resize_host_window(U32 the_window, int width, int height)   
+{
+  XResizeWindow(the_display,(Window)the_window,
+                (unsigned int)sup(30,width),
+                (unsigned int)sup(30,height)); 
+}
+   
 void	host_sc_paint_rectangle(U32 handle, U32 gc, int x, int y, int w, int h, U32 color)
 {
 	unsigned long xcolor = RGB_to_X(color); 
@@ -2692,9 +2692,9 @@ switch (get16(1))
     */ 
   case sc_host_window_size:
     {
-			int wSize;
-			int hSize;
-			U32 the_window = ((U32 *)(((U32 *)(*(SP-1)))[1]))[1]; 
+      int wSize;
+      int hSize;
+      U32 the_window = ((U32 *)(((U32 *)(*(SP-1)))[1]))[1];
       if ((R = allocate_data_segment(3,allocator)) == 0)
         {
@@ -2702,7 +2702,7 @@ switch (get16(1))
           goto end; 
         }
-			host_sc_host_window_size(the_window, &wSize, &hSize);
+      host_sc_host_window_size(the_window, &wSize, &hSize);
       ((U32 *)R)[1] = wSize; 
       ((U32 *)R)[2] = hSize; 
@@ -2712,6 +2712,23 @@ switch (get16(1))
     goto do_computing; 
+    /* Expects:      at *(SP-1):     HostWindow
+                     at *(SP-2):     (Int32)width
+                     at *(SP-3):     (Int32)height
+   
+       Returns:      (One)unique     (i.e. 0)
+     */
+  case sc_resize_host_window:
+    {
+      U32 the_window = ((U32 *)(((U32 *)(*(SP-1)))[1]))[1];
+   
+      host_sc_resize_host_window(the_window,*(SP-2),*(SP-3)); 
+   
+      R = 0; 
+    }
+    IP += 1+2; 
+    goto do_computing; 
+   
     /* 
        Returns:   ((Int32,Int32))(width,height)
@@ -126,6 +126,13 @@ void	host_sc_host_window_size(U32 theWindow, int * wSize, int * hSize)
 	*hSize = rect.bottom - rect.top;
 }
+void    host_sc_resize_host_window(U32 theWindow, int width, int height)
+{
+   Salut David !
+     noublie pas de mettre quelque chose comme sup(30,width) et sup(30,height) pour éviter les tailles
+     négatives ou trop petites. 
+}
+   
 void	host_pixmap_size(U32 thePixmap, int * wSize, int * hSize)
 {
 	HostImage pixmap = (HostImage)thePixmap;