新增样式

Author: evilbinary

.gitignore

@@ -11,6 +11,6 @@ bin/*.boot
 bin/imgui.ini
 lib/scheme/scheme
 
- lib/libglut
- lib/libscm
+lib/libglut
+lib/libscm
 

apps/calc.ss

@@ -21,7 +21,8 @@
   (let ((exp "") (clear #t))
     (glut-init)
     (imgui-init)
-                                        ;(android)
+    (imgui-reset-style 7)
+                                    ;(android)
                                         ;(imgui-scale (* 1.5 (android-get-density)) (* 1.5 (android-get-density)))
     (glut-touch-event (lambda (type x y)
                         (imgui-touch-event type x y)

gui/glut.ss

@@ -27,6 +27,9 @@
             glut-hide-soft-input
             glut-event-get
 
+            glut-init-window-size
+            glut-init-window-position 
+
             glut-init-callback
             glut-on-key-event-callback
             glut-on-touch-event-callback
@@ -45,6 +48,13 @@
 
     (define lib (load-lib lib-name))
 
+  (define-syntax define-glut
+                    (syntax-rules ()
+                      ((_ ret name args)
+                       (define name
+                         (foreign-procedure (lower-camel-case (string-split (symbol->string 'name) #\- )) args ret)))))
+
+    (define glut-init-proc '())
 
     (define glut-display-proc '())
     (define glut-reshape-proc '())
@@ -53,9 +63,21 @@
     (define glut-motion-event-proc '())
     (define glut-mouse-event-proc '())
 
-    (define glut-init
+    (define glut-init-op  
       (foreign-procedure "glut_init" () void))
+
+    (define (glut-init . args)
+        (if (= 0 (length args) )
+          (glut-init-op)
+          (if (procedure? (car args))
+            (begin
+              (set! glut-init-proc (car args) )
+              (glut-init-op)
+              )
+            )))
 
+
+
     (define glut-main-loop
       (foreign-procedure "glut_main_loop" () void))
 
@@ -75,6 +97,11 @@
     (define glut-set-soft-input-mode
                       (foreign-procedure "glut_set_soft_input_mode" (int int) void))
 
+    ;;c function
+    (define-glut void glut-init-window-size (int int ) )
+    (define-glut void glut-init-window-position (int int ) )
+
+
     (define is-soft-input-show #f)
     (define glut-show-soft-input (lambda ()
         (if (not is-soft-input-show)
@@ -90,11 +117,13 @@
             ))
 
     (define (glut-init-callback)
-      1
+      (if (procedure? glut-init-proc)
+              (glut-init-proc)
+              )
     )
 
     (define (glut-on-key-event-callback . args)
-        ;(glut-log (format "on-key-event callback arg==~a ~a\n" (length args) (car args)   ) )
+        (glut-log (format "on-key-event callback arg==~a ~a\n" (length args) (car args)   ) )
           (if (procedure? glut-key-event-proc)
               (if (= 2 (length args) )
                 (glut-key-event-proc (car args) (cadr args))

gui/imgui.ss

@@ -26,6 +26,10 @@
             imgui-pvec2
             imgui-uvec2
 
+            imgui-load-style 
+            imgui-save-style 
+            imgui-reset-style
+
             imgui-get-io
             imgui-text
             imgui-new-frame
@@ -45,6 +49,8 @@
             imgui-is-mouse-clicked
             imgui-is-mouse-down
             imgui-image
+            imgui-tree-node
+            imgui-tree-pop
 
             ;consts
             imgui-set-cond-always
@@ -60,24 +66,7 @@
             imgui-separator
           )
 
-         (import  (scheme) (utils libutil) )
-         (define (split str)
-               (let f ((i 0) (n (string-length str)))
-                 (cond
-                   ((= i n) (list (substring str 0 n) ))
-                   ((char=? (string-ref str i) #\-)
-                      (cons (substring str 0 i)
-                            (split (substring str (+ i 1) n))))
-                   (else (f (+ i 1) n)))))
-         (define (lower-camel-case l)
-           (let loop
-             ((x l) (s "" ) (i 0) )
-              (if (null? x)
-                  s
-                  (begin
-                    (if (> i 0)
-                        (string-set!  (car x) 0 (char-upcase (string-ref (car x) 0))))
-                    (loop (cdr x) (string-append s (car x)) (+ i 1))))))
+        (import  (scheme) (utils libutil) )
 
         (define lib-name
            (case (machine-type)
@@ -92,7 +81,7 @@
                     (syntax-rules ()
                       ((_ ret name args)
                        (define name
-                         (foreign-procedure (lower-camel-case (split (symbol->string 'name) )) args ret)))))
+                         (foreign-procedure (lower-camel-case (string-split (symbol->string 'name) #\- )) args ret)))))
 
 
          (define-ftype imgui-vec2 (struct [x float] [y float]))
@@ -121,6 +110,10 @@
         (define-c-function void* imgui-pvec2 (float float) )
         (define-c-function void imgui-uvec2 (void*) )
 
+        ;;样式加载和修改
+        (define-c-function boolean imgui-load-style (string) )
+        (define-c-function boolean imgui-save-style (string) )
+        (define-c-function boolean imgui-reset-style (int) )
 
          (define-imgui void* imgui-get-io () )
          (define-imgui void imgui-render () )
@@ -135,6 +128,9 @@
          (define-imgui boolean imgui-button (string void*) )
          (define-imgui boolean imgui-small-button (string void*) )
          (define-imgui boolean imgui-checkbox (string u8*) )
+         (define-imgui boolean imgui-tree-node (string) )
+         (define-imgui void imgui-tree-pop () )
+
 
          (define-imgui boolean imgui-input-text (string string int int void* void*))
          (define-imgui boolean imgui-input-text-multiline (string string int int void* void* void* ) )

lib/libimgui/Android.mk

@@ -24,24 +24,27 @@ SCM=$(LOCAL_PATH)/../libscm
 
 LOCAL_MODULE    := imgui
 LOCAL_SRC_FILES := imgui_impl_gl.cpp \
-    imgui/imgui.cpp \
-    imgui/imgui_draw.cpp \
-    imgui/imgui_demo.cpp \
-    cimgui/cimgui.cpp \
-    cimgui/drawList.cpp \
-    cimgui/fontAtlas.cpp \
+    $(IMGUI)/imgui.cpp \
+    $(IMGUI)/imgui_draw.cpp \
+    $(IMGUI)/imgui_demo.cpp \
+    $(CIMGUI)/cimgui.cpp \
+    $(CIMGUI)/drawList.cpp \
+    $(CIMGUI)/fontAtlas.cpp \
     main.cpp    \
-    keyboard.cpp
+    keyboard.cpp \
+    addons/imguistyleserializer/imguistyleserializer.cpp \
+
 
 
 
 LOCAL_ARM_MODE := arm
 
-LOCAL_C_INCLUDES := imgui -I$(SCM)
+LOCAL_C_INCLUDES := imgui -I$(SCM) addons
 
 
-LOCAL_CFLAGS +=  -I. -I./c/ -I$(IMGUI)  -I$(SCM)
-LOCAL_CXXFLAGS+= -I. -I./c/ -I$(IMGUI) -I$(SCM)  -std=c++11
+LOCAL_CFLAGS +=  -I. -I./c/ -I$(IMGUI)  -I$(SCM) -Iaddons -I$(LOCAL_PATH)/addons/imguistyleserializer 
+LOCAL_CXXFLAGS+= -I. -I./c/ -I$(IMGUI) -I$(SCM) -DANDROID -std=c++11 \
+    -I$(LOCAL_PATH)/addons/ -I$(LOCAL_PATH)/addons/imguistyleserializer
 
 LOCAL_CFLAGS += -g -Wall -DANDROID   -DINLINES -DGC_MACROS -fPIC -Wno-unused-parameter -pie -fPIE  -fpermissive -std=c++11
 

lib/libimgui/Makefile

@@ -15,11 +15,15 @@ OBJS = main.o \
     cimgui/drawList.o \
     cimgui/fontAtlas.o \
     imgui_impl_glb.o \
+    addons/imguistyleserializer/imguistyleserializer.o \
+
     #test.o
 
 LIBS =-L../libscm -lscm 
 CFLAGS = -Wall -Wformat 
-CXXFLAGS= -Wall -Wformat -Iimgui -I../libscm -g -std=c++11 -DLOG
+CXXFLAGS= -Wall -Wformat -Iimgui -I../libscm -g -std=c++11 -DLOG \
+	-Iaddons/ \
+	-Iaddons/imguistyleserializer 
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S), Linux) #LINUX

lib/libimgui/addons/imgui_user.h

@@ -0,0 +1,14 @@
+#ifndef IMGUI_INCLUDE_IMGUI_USER_INL
+#define IMGUI_INCLUDE_IMGUI_USER_INL
+
+#ifndef NO_IMGUISTYLESERIALIZER
+#include "./imguistyleserializer/imguistyleserializer.h"
+#endif //NO_IMGUISTYLESERIALIZER
+#ifndef NO_IMGUICODEEDITOR
+//#include "./imguicodeeditor/imguicodeeditor.h"
+#endif //NO_IMGUICODEEDITOR
+
+
+#endif
+
+