WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/ Rev 9951 and /programs/develop/ Rev 9952

Ignore whitespace Rev 9951 → Rev 9952

/programs/develop/kosjs/examples/example.js
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/regexp.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jscompile.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/utf.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/regexp.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/utftype.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsdump.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/utf.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsparse.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsvalue.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsdate.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsparse.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsboolean.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsstate.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsvalue.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/import.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/astnames.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jslex.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsgc.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsregexp.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsi.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jslex.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/Makefile
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsintern.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsrun.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsstring.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsobject.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsbuiltin.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/AUTHORS
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsrepr.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsrun.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/Tupfile.lua
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/opnames.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsbuiltin.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/json.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsarray.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/README
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/pp.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsproperty.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsfunction.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/mujs.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsdtoa.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsnumber.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jscompile.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jsmath.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/jserror.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/libmujs/COPYING
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/Tupfile.lua
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/import.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/kosjs/Makefile
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/backy/gcc_version/readme.txt
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/backy/gcc_version/Makefile
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/backy/gcc_version/Backy_lib.h
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/backy/gcc_version/Tupfile.lua
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/programs/develop/backy/gcc_version/Backy.c
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /programs/develop/libraries/newlib_example/main.c
 ,87 → 1,85
-#include <kos32sys.h>
+#include <sys/ksys.h>
-#define B_SZ    10
+#define B_SZ  10
-static char * Title="BinClock";
+static char* title = "BinClock";
-static void draw_small_box(int x,int y,int is_on)
+static void draw_small_box(int x, int y, int is_on)
 {
- draw_bar(x,y,B_SZ,B_SZ,is_on ? 0xFF0000 : 0x103000);
+   _ksys_draw_bar(x, y, B_SZ, B_SZ, is_on ? 0xFF0000 : 0x103000);
 }
-static void draw_box_group(int x,int y,int num)
+static void draw_box_group(int x, int y, int num)
 {
- int i,j;
- char buf[2];
- buf[0]=(num&(1+2+4+8))+'0';
- buf[1]='\0';
- for(i=0;i<4;i++)
- {
-  j=(B_SZ+2)*i;
-  draw_small_box(x,y+((B_SZ+2)*i),num & (1<<(3-i)) ? 1 : 0);
- }
- draw_bar(x,y+((B_SZ+2)*4),B_SZ,B_SZ,0x800000);
- draw_text_sys(buf,x+2,y+((B_SZ+2)*4)+3,1,0xFFFFFF);
+    int i, j;
+    char buf[2];
+    buf[0] = (num&(1+2+4+8))+'0';
+    buf[1] = '\0';
+    for(i = 0; i < 4; i++) {
+        j = (B_SZ+2)*i;
+        draw_small_box(x,y+((B_SZ+2)*i),num & (1<<(3-i)) ? 1 : 0);
+    }
+    _ksys_draw_bar(x, y+((B_SZ+2)*4),B_SZ,B_SZ, 0x800000);
+    _ksys_draw_text(buf, x+2, y+((B_SZ+2)*4)+3, 1, 0xFFFFFF);
 }
 static void draw_bcd_num(int x,int y,int num)
 {
- int v1,v2;
- v1=(num>>4)&(1+2+4+8);
- v2=num & (1+2+4+8);
- draw_box_group(x,y,v1);
- draw_box_group(x+B_SZ+2,y,v2);
+    int v1, v2;
+    v1 = (num>>4)&(1+2+4+8);
+    v2 = num&(1+2+4+8);
+    draw_box_group(x, y, v1);
+    draw_box_group(x+B_SZ+2, y ,v2);
 }
 static void draw_hms(int x,int y)
 {
- unsigned t;
- int h,m,s;
- __asm__ __volatile__("int $0x40" : "=a"(t) : "a"(3));
- s=(t & 0x00FF0000)>>16;
- m=(t & 0x0000FF00)>>8;
- h=(t & 0x000000FF);
- draw_bcd_num(x,y,h);
- x+=((B_SZ+2)<<1)+2;
- draw_bcd_num(x,y,m);
- x+=((B_SZ+2)<<1)+2;
- draw_bcd_num(x,y,s);
+    unsigned t;
+    int h, m, s;
+    __asm__ __volatile__("int $0x40" : "=a"(t) : "a"(3));
+    s = (t & 0x00FF0000)>>16;
+    m = (t & 0x0000FF00)>>8;
+    h = (t & 0x000000FF);
+    draw_bcd_num(x,y,h);
+    x+=((B_SZ+2)<<1)+2;
+    draw_bcd_num(x,y,m);
+    x+=((B_SZ+2)<<1)+2;
+    draw_bcd_num(x,y,s);
 }
 static void draw_h(void)
 {
- draw_hms(22,28);
+    draw_hms(22, 28);
 }
 static void paint(void)
 {
- BeginDraw();
- DrawWindow(100,100,40+((B_SZ+2)*6)+4,30+((B_SZ+2)*4)+16,Title,0x80,0x13);
- draw_bar(20,26,((B_SZ+2)*6)+4+2,4+((B_SZ+1)*4)+2,0);
- draw_h();
- EndDraw();
+    _ksys_start_draw();
+    _ksys_create_window(100, 100, 40+((B_SZ+2)*6)+4,30+((B_SZ+2)*4)+16, title, 0x80, 0x13);
+    _ksys_draw_bar(20, 26, ((B_SZ+2)*6)+4+2,4+((B_SZ+1)*4)+2, 0);
+    draw_h();
+    _ksys_end_draw();
 }
 int main(void)
 {
- int i;
- paint();
- for(;;)
- {
-  i=wait_for_event(20);
-  draw_h();
-  switch(i)
-  {
-   case 1:
+    int i;
     paint();
-    continue;
-   case 2:
-    get_key();
-    continue;
-   case 3:
-    if(get_os_button()==1) return 0;
-    continue;
-  }
- }
+    for(;;) {
+        i = _ksys_wait_event_timeout(20);
+        draw_h();
+        switch(i) {
+            case 1:
+                paint();
+                continue;
+            case 2:
+                _ksys_get_key();
+                continue;
+            case 3:
+                if (_ksys_get_button() == 1) return 0;
+                continue;
+        }
+    }
 }

Subversion Repositories Kolibri OS

Compare Revisions

Ignore whitespace Rev 9951 → Rev 9952