KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Refactoring sys/kos.h

Browse Source 
git-svn-id: svn://kolibrios.org@9757 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
maxcodehack 2022-04-06 14:37:19 +00:00
parent f1b9d66b39
commit 4fae618b2c
1 changed files with 74 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
contrib/sdk/sources/newlib/libc/include/sys/kos.h
View File

@ -1,13 +1,9 @@
//////////////////////////////////////////// /*
// KolibriOS Syscalls // sys/kos.h
// sys/kos.h // An attempt to create new C/C++ wrapper for syscalls
// Based on kos32sys and other wrappers // Based on kos32sys.h
// // KolibriOS Team
// Syscalls scheme: kos_XxxYyy // */
// (e.g. kos_DrawWindow) //
////////////////////////////////////////////
// Some code was written by maxcodehack
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -15,10 +11,9 @@
/*********************** Types *************************/ /*********************** Types *************************/
typedef unsigned int color_t; typedef unsigned int color_t;
// Struct for App running // struct for sysfn 70
#pragma pack(push,1) #pragma pack(push,1)
typedef struct typedef struct {
{
unsigned p00; unsigned p00;
unsigned p04; unsigned p04;
char *p08; char *p08;
@ -29,27 +24,23 @@ char *p21;
} kos_Struct70; } kos_Struct70;
#pragma pack(pop) #pragma pack(pop)
// Blitter struct // struct for blitter
struct blit_call struct blit_call {
{
int dstx; int dstx;
int dsty; int dsty;
int w; int w;
int h; int h;
int srcx; int srcx;
int srcy; int srcy;
int srcw; int srcw;
int srch; int srch;
void *bitmap; void *bitmap;
int stride; int stride;
}; };
// Process info for sysfn 9 // struct for sysfn 9
#pragma pack(push, 1) #pragma pack(push, 1)
struct proc_info struct proc_info {
{
unsigned long cpu_usage; unsigned long cpu_usage;
unsigned short pos_in_stack; unsigned short pos_in_stack;
unsigned short slot; unsigned short slot;
@ -68,7 +59,7 @@ struct proc_info
}; };
#pragma pack(pop) #pragma pack(pop)
// Color struct for sysfn 48 // struct for sysfn 48
struct kolibri_system_colors { struct kolibri_system_colors {
color_t frame_area; color_t frame_area;
color_t grab_bar; color_t grab_bar;
@ -82,11 +73,9 @@ struct kolibri_system_colors {
color_t work_graph; color_t work_graph;
}; };
typedef union __attribute__((packed)) typedef union __attribute__((packed)) {
{
uint32_t val; uint32_t val;
struct struct {
{
short x; short x;
short y; short y;
}; };
@ -94,24 +83,17 @@ typedef union __attribute__((packed))
/*********************** Window Syscalls *************************/ /*********************** Window Syscalls *************************/
// Start drawing static inline void kos_BeginDraw(void) {
static inline void kos_BeginDraw(void)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" ::"a"(12),"b"(1)); "int $0x40" ::"a"(12),"b"(1));
}; };
// End drawing static inline void kos_EndDraw(void) {
static inline void kos_EndDraw(void)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" ::"a"(12),"b"(2)); "int $0x40" ::"a"(12),"b"(2));
}; };
// Draw window static inline void kos_DrawWindow(int x, int y, int w, int h, const char *title, color_t bgcolor, uint32_t style) {
static inline void kos_DrawWindow(int x, int y, int w, int h, const char *title,
color_t bgcolor, uint32_t style)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(0), ::"a"(0),
@ -122,14 +104,11 @@ static inline void kos_DrawWindow(int x, int y, int w, int h, const char *title,
"S"(0) : "memory"); "S"(0) : "memory");
}; };
// Set window layer behaviour
#define ZPOS_DESKTOP -2 #define ZPOS_DESKTOP -2
#define ZPOS_ALWAYS_BACK -1 #define ZPOS_ALWAYS_BACK -1
#define ZPOS_NORMAL 0 #define ZPOS_NORMAL 0
#define ZPOS_ALWAYS_TOP 1 #define ZPOS_ALWAYS_TOP 1
static inline void kos_SetWindowLayerBehaviour(int zpos) {
static inline void kos_SetWindowLayerBehaviour(int zpos)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(18), ::"a"(18),
@ -139,10 +118,8 @@ static inline void kos_SetWindowLayerBehaviour(int zpos)
"S"(zpos) : "memory"); "S"(zpos) : "memory");
}; };
// Change window size
#define OLD -1 #define OLD -1
static inline void kos_ChangeWindow(int new_x, int new_y, int new_w, int new_h) static inline void kos_ChangeWindow(int new_x, int new_y, int new_w, int new_h) {
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(67), "b"(new_x), "c"(new_y), "d"(new_w),"S"(new_h) ::"a"(67), "b"(new_x), "c"(new_y), "d"(new_w),"S"(new_h)
@ -150,9 +127,7 @@ static inline void kos_ChangeWindow(int new_x, int new_y, int new_w, int new_h)
} }
/*********************** Other GUI functions *************************/ /*********************** Other GUI functions *************************/
// Draw text static inline void kos_DrawText(int x, int y, const char *text, color_t color) {
static inline void kos_DrawText(int x, int y, const char *text, color_t color)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(4),"d"(text), ::"a"(4),"d"(text),
@ -161,9 +136,7 @@ static inline void kos_DrawText(int x, int y, const char *text, color_t color)
:"memory"); :"memory");
} }
// Draw button static inline void kos_DrawButton(int x, int y, int w, int h, int id, color_t color) {
static inline void kos_DrawButton(int x, int y, int w, int h, int id, color_t color)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(8), ::"a"(8),
@ -173,9 +146,7 @@ static inline void kos_DrawButton(int x, int y, int w, int h, int id, color_t co
"S"(color)); "S"(color));
}; };
// Draw button with text static inline void kos_DrawButtonWithText(int x, int y, int w, int h, int id, color_t color, const char* text) {
void kos_DrawButtonWithText(int x, int y, int w, int h, int id, color_t color, const char* text)
{
kos_DrawButton(x, y, w, h, id, color); kos_DrawButton(x, y, w, h, id, color);
int tx = ((((-strlen(text))*8)+w)/2)+x; int tx = ((((-strlen(text))*8)+w)/2)+x;
@ -184,9 +155,7 @@ void kos_DrawButtonWithText(int x, int y, int w, int h, int id, color_t color, c
kos_DrawText(tx, ty, text, 0x90000000); kos_DrawText(tx, ty, text, 0x90000000);
}; };
// Draw line static inline void kos_DrawLine(int x_start, int y_start, int x_end, int y_end, color_t color) {
static inline void kos_DrawLine(int x_start, int y_start, int x_end, int y_end, color_t color)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(38), "d"(color), ::"a"(38), "d"(color),
@ -194,9 +163,7 @@ static inline void kos_DrawLine(int x_start, int y_start, int x_end, int y_end,
"c"((y_start << 16) | y_end)); "c"((y_start << 16) | y_end));
} }
// Draw bar static inline void kos_DrawBar(int x, int y, int w, int h, color_t color) {
static inline void kos_DrawBar(int x, int y, int w, int h, color_t color)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(13), "d"(color), ::"a"(13), "d"(color),
@ -204,8 +171,7 @@ static inline void kos_DrawBar(int x, int y, int w, int h, color_t color)
"c"((y << 16) | h)); "c"((y << 16) | h));
} }
// Put one pixel static inline void kos_PutPixel(int x, int y, color_t color) {
void kos_PutPixel(int x, int y, color_t color) {
__asm__ __volatile__("int $0x40" __asm__ __volatile__("int $0x40"
::"a"(1), ::"a"(1),
"b"(x), "b"(x),
@ -213,9 +179,7 @@ void kos_PutPixel(int x, int y, color_t color) {
"d"(color)); "d"(color));
} }
// Draw bitmap image static inline void kos_DrawBitmap(void *bitmap, int x, int y, int w, int h) {
static inline void kos_DrawBitmap(void *bitmap, int x, int y, int w, int h)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(7), "b"(bitmap), ::"a"(7), "b"(bitmap),
@ -223,7 +187,6 @@ static inline void kos_DrawBitmap(void *bitmap, int x, int y, int w, int h)
"d"((x << 16) | y)); "d"((x << 16) | y));
} }
// Blitter
static inline void Blit(void *bitmap, int dst_x, int dst_y, static inline void Blit(void *bitmap, int dst_x, int dst_y,
int src_x, int src_y, int w, int h, int src_x, int src_y, int w, int h,
int src_w, int src_h, int stride) int src_w, int src_h, int stride)
@ -247,8 +210,7 @@ static inline void Blit(void *bitmap, int dst_x, int dst_y,
}; };
// Get screen part as image // Get screen part as image
static inline void kos_ScreenShot(char* image, int x, int y, int w, int h) static inline void kos_ScreenShot(char* image, int x, int y, int w, int h) {
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(36), ::"a"(36),
@ -258,9 +220,8 @@ static inline void kos_ScreenShot(char* image, int x, int y, int w, int h)
}; };
/*********************** Skin *************************/ /*********************** Skin *************************/
// Return skin height // Get skin height
static inline uint32_t kos_SkinHeight(void) static inline uint32_t kos_SkinHeight(void) {
{
uint32_t height; uint32_t height;
__asm__ __volatile__( __asm__ __volatile__(
@ -271,15 +232,11 @@ static inline uint32_t kos_SkinHeight(void)
}; };
/*********************** Mouse *************************/ /*********************** Mouse *************************/
// Get mouse position
#define POS_SCREEN 0 #define POS_SCREEN 0
#define POS_WINDOW 1 #define POS_WINDOW 1
static inline static inline pos_t kos_GetMousePos(int origin) {
pos_t kos_GetMousePos(int origin)
{
pos_t val; pos_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40 \n\t" "int $0x40 \n\t"
"rol $16, %%eax" "rol $16, %%eax"
@ -288,10 +245,7 @@ pos_t kos_GetMousePos(int origin)
return val; return val;
} }
// Get mouse buttons static inline uint32_t kos_GetMouseButtons(void) {
static inline
uint32_t kos_GetMouseButtons(void)
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
@ -301,10 +255,7 @@ uint32_t kos_GetMouseButtons(void)
return val; return val;
}; };
// Get mouse wheels static inline uint32_t kos_GetMouseWheels(void) {
static inline
uint32_t kos_GetMouseWheels(void)
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
@ -314,9 +265,7 @@ uint32_t kos_GetMouseWheels(void)
return val; return val;
}; };
// Load cursor static inline uint32_t kos_LoadCursor(void *path, uint32_t flags) {
static inline uint32_t kos_LoadCursor(void *path, uint32_t flags)
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -325,9 +274,7 @@ static inline uint32_t kos_LoadCursor(void *path, uint32_t flags)
return val; return val;
} }
// Set cursor static inline uint32_t kos_SetCursor(uint32_t cursor) {
static inline uint32_t kos_SetCursor(uint32_t cursor)
{
uint32_t old; uint32_t old;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -336,9 +283,7 @@ static inline uint32_t kos_SetCursor(uint32_t cursor)
return old; return old;
}; };
// Destroy cursor static inline int kos_DestroyCursor(uint32_t cursor) {
static inline int kos_DestroyCursor(uint32_t cursor)
{
int ret; int ret;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -359,9 +304,7 @@ static inline int kos_DestroyCursor(uint32_t cursor)
#define evNetwork 8 #define evNetwork 8
#define evDebug 9 #define evDebug 9
static inline static inline uint32_t kos_WaitForEventTimeout(uint32_t time) {
uint32_t kos_WaitForEventTimeout(uint32_t time)
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -370,8 +313,7 @@ uint32_t kos_WaitForEventTimeout(uint32_t time)
return val; return val;
}; };
static inline uint32_t kos_CheckForEvent(void) static inline uint32_t kos_CheckForEvent(void) {
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -380,8 +322,7 @@ static inline uint32_t kos_CheckForEvent(void)
return val; return val;
}; };
static inline uint32_t kos_WaitForEvent(void) static inline uint32_t kos_WaitForEvent(void) {
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -404,8 +345,7 @@ static inline uint32_t kos_WaitForEvent(void)
#define EVM_MOUSE_FILTER 0x80000000 #define EVM_MOUSE_FILTER 0x80000000
#define EVM_CURSOR_FILTER 0x40000000 #define EVM_CURSOR_FILTER 0x40000000
static inline uint32_t kos_SetMaskForEvents(uint32_t event_mask) static inline uint32_t kos_SetMaskForEvents(uint32_t event_mask) {
{
uint32_t old_event_mask; uint32_t old_event_mask;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -416,18 +356,13 @@ static inline uint32_t kos_SetMaskForEvents(uint32_t event_mask)
}; };
/*********************** Other *************************/ /*********************** Other *************************/
// Get key static inline int kos_GetKey() {
int kos_GetKey()
{
unsigned short key; unsigned short key;
__asm__ __volatile__("int $0x40":"=a"(key):"0"(2)); __asm__ __volatile__("int $0x40":"=a"(key):"0"(2));
if(!(key & 0xFF)) return (key>>8)&0xFF; else return 0; if(!(key & 0xFF)) return (key>>8)&0xFF; else return 0;
} }
// Get pressed button ID static inline uint32_t kos_GetButtonID(void) {
static inline
uint32_t kos_GetButtonID(void)
{
uint32_t val; uint32_t val;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -436,19 +371,14 @@ uint32_t kos_GetButtonID(void)
return val>>8; return val>>8;
}; };
// Sleep.. static inline void kos_Delay(uint32_t time) {
static inline void kos_Delay(uint32_t time)
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
::"a"(5), "b"(time) ::"a"(5), "b"(time)
:"memory"); :"memory");
}; };
// Get screen size static inline pos_t kos_ScreenSize() {
static inline
pos_t kos_ScreenSize()
{
pos_t size; pos_t size;
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
@ -458,18 +388,15 @@ pos_t kos_ScreenSize()
return size; return size;
}; };
// Get system color table static inline void kos_GetSystemColors(struct kolibri_system_colors *color_table) {
static inline void kos_GetSystemColors(struct kolibri_system_colors *color_table)
{
__asm__ __volatile__ ("int $0x40" __asm__ __volatile__ ("int $0x40"
: :
:"a"(48),"b"(3),"c"(color_table),"d"(40) :"a"(48),"b"(3),"c"(color_table),"d"(40)
); );
} }
// SysFn 9 // sysfn 9
static inline void kos_ProcessInfo(char *info) static inline void kos_ProcessInfo(char *info) {
{
__asm__ __volatile__( __asm__ __volatile__(
"int $0x40" "int $0x40"
: :
@ -477,8 +404,7 @@ static inline void kos_ProcessInfo(char *info)
:"memory"); :"memory");
}; };
void kos_RunApp(char* app, char* param) static inline void kos_RunApp(char* app, char* param) {
{
kos_Struct70 r; kos_Struct70 r;
r.p00 = 7; r.p00 = 7;
r.p04 = 0; r.p04 = 0;