ace-dent/kolibrios-gitea
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

sdk: aliases

Browse Source 
git-svn-id: svn://kolibrios.org@5061 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2014-08-26 14:10:17 +00:00
parent 0703f59264
commit 0dc19e3af3
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/media/fplay/winlib/frame.c
View File

@ -140,7 +140,7 @@ int frame_proc(ctrl_t *ctrl, uint32_t msg, uint32_t arg1, uint32_t arg2)
if(win->win_state == FULLSCREEN) if(win->win_state == FULLSCREEN)
return 0; return 0;
x = ((pos_t)arg2).x; x = ((pos_t)arg2).x;
y = ((pos_t)arg2).y; y = ((pos_t)arg2).y;
@ -201,7 +201,7 @@ int frame_proc(ctrl_t *ctrl, uint32_t msg, uint32_t arg1, uint32_t arg2)
int relx, rely; int relx, rely;
capture_mouse(ctrl); capture_mouse(ctrl);
spos = get_cursor_pos(); spos = GetMousePos(POS_SCREEN);
fr->track = rc; fr->track = rc;
relx = spos.x - win->rc.l; relx = spos.x - win->rc.l;
@ -235,7 +235,7 @@ int frame_proc(ctrl_t *ctrl, uint32_t msg, uint32_t arg1, uint32_t arg2)
if(mouse_capture == ctrl) if(mouse_capture == ctrl)
{ {
pos_t npos; pos_t npos;
npos = get_cursor_pos(); npos = GetMousePos(POS_SCREEN);
// printf("cursor pos %dx%d\n", npos.x, npos.y); // printf("cursor pos %dx%d\n", npos.x, npos.y);
if( npos.val != spos.val) if( npos.val != spos.val)

4
contrib/media/fplay/winlib/window.c
View File

@ -397,7 +397,7 @@ static void do_sys_mouse(window_t *win)
pos_t pos; pos_t pos;
mouse_action = 0; mouse_action = 0;
pos = get_mouse_pos(); pos = GetMousePos(POS_WINDOW);
if(pos.val != old_pos.val) if(pos.val != old_pos.val)
{ {
@ -406,7 +406,7 @@ static void do_sys_mouse(window_t *win)
}; };
// printf("pos x%d y%d\n", pos.x, pos.y); // printf("pos x%d y%d\n", pos.x, pos.y);
buttons = get_mouse_buttons(); buttons = GetMouseButtons();
wheels = get_mouse_wheels(); wheels = get_mouse_wheels();
if( wheels & 0xFFFF){ if( wheels & 0xFFFF){

47
contrib/sdk/sources/newlib/libc/include/kos32sys.h
View File

@ -71,7 +71,8 @@ uint32_t get_skin_height(void)
:"=a"(height) :"=a"(height)
:"a"(48),"b"(4)); :"a"(48),"b"(4));
return height; return height;
} };
static inline uint32_t GetSkinHeight(void) __attribute__ ((alias ("get_skin_height")));
static inline static inline
void BeginDraw(void) void BeginDraw(void)
@ -101,8 +102,11 @@ static inline void DrawWindow(int x, int y, int w, int h, const char *name,
"S"(0)); "S"(0));
}; };
#define POS_SCREEN 0
#define POS_WINDOW 1
static inline static inline
pos_t get_mouse_pos(void) pos_t get_mouse_pos(int origin)
{ {
pos_t val; pos_t val;
@ -110,22 +114,10 @@ pos_t get_mouse_pos(void)
"int $0x40 \n\t" "int $0x40 \n\t"
"rol $16, %%eax" "rol $16, %%eax"
:"=a"(val) :"=a"(val)
:"a"(37),"b"(1)); :"a"(37),"b"(origin));
return val;
}
static inline
pos_t get_cursor_pos(void)
{
pos_t val;
__asm__ __volatile__(
"int $0x40 \n\t"
"rol $16, %%eax"
:"=a"(val)
:"a"(37),"b"(0));
return val; return val;
} }
static inline pos_t GetMousePos(int origin) __attribute__ ((alias ("get_mouse_pos")));
static inline static inline
uint32_t get_mouse_buttons(void) uint32_t get_mouse_buttons(void)
@ -138,6 +130,7 @@ uint32_t get_mouse_buttons(void)
:"a"(37),"b"(2)); :"a"(37),"b"(2));
return val; return val;
}; };
static inline uint32_t GetMouseButtons(void) __attribute__ ((alias ("get_mouse_buttons")));
static inline static inline
uint32_t get_mouse_wheels(void) uint32_t get_mouse_wheels(void)
@ -150,6 +143,7 @@ uint32_t get_mouse_wheels(void)
:"a"(37),"b"(7)); :"a"(37),"b"(7));
return val; return val;
}; };
static inline uint32_t GetMouseWheels(void) __attribute__ ((alias ("get_mouse_wheels")));
static inline static inline
uint32_t wait_for_event(uint32_t time) uint32_t wait_for_event(uint32_t time)
@ -181,6 +175,7 @@ static inline uint32_t get_os_event()
:"a"(10)); :"a"(10));
return val; return val;
}; };
static inline uint32_t GetOsEvent(void) __attribute__ ((alias ("get_os_event")));
static inline static inline
uint32_t get_tick_count(void) uint32_t get_tick_count(void)
@ -306,6 +301,7 @@ void *user_alloc(size_t size)
:"a"(68),"b"(12),"c"(size)); :"a"(68),"b"(12),"c"(size));
return val; return val;
} }
static inline void *UserAlloc(size_t size) __attribute__ ((alias ("user_alloc")));
static inline static inline
int user_free(void *mem) int user_free(void *mem)
@ -317,6 +313,7 @@ int user_free(void *mem)
:"a"(68),"b"(13),"c"(mem)); :"a"(68),"b"(13),"c"(mem));
return val; return val;
} }
static inline int UserFree(void *mem) __attribute__ ((alias ("user_free")));
static inline static inline
int *user_unmap(void *base, size_t offset, size_t size) int *user_unmap(void *base, size_t offset, size_t size)
@ -327,7 +324,8 @@ int *user_unmap(void *base, size_t offset, size_t size)
:"=a"(val) :"=a"(val)
:"a"(68),"b"(26),"c"(base),"d"(offset),"S"(size)); :"a"(68),"b"(26),"c"(base),"d"(offset),"S"(size));
return val; return val;
} };
static inline int *UserUnmap(void *base, size_t offset, size_t size) __attribute__ ((alias ("user_unmap")));
typedef union typedef union
{ {
@ -351,7 +349,7 @@ static inline ufile_t load_file(const char *path)
return uf; return uf;
}; };
static inline ufile_t LoadFile(const char *path) __attribute__ ((alias ("load_file")));
static inline int GetScreenSize() static inline int GetScreenSize()
{ {
@ -374,6 +372,8 @@ uint32_t load_cursor(void *path, uint32_t flags)
:"a"(37), "b"(4), "c"(path), "d"(flags)); :"a"(37), "b"(4), "c"(path), "d"(flags));
return val; return val;
} }
static inline
uint32_t LoadCursor(void *path, uint32_t flags) __attribute__ ((alias ("load_cursor")));
static inline static inline
uint32_t set_cursor(uint32_t cursor) uint32_t set_cursor(uint32_t cursor)
@ -384,7 +384,8 @@ uint32_t set_cursor(uint32_t cursor)
:"=a"(old) :"=a"(old)
:"a"(37), "b"(5), "c"(cursor)); :"a"(37), "b"(5), "c"(cursor));
return old; return old;
} };
static inline uint32_t SetCursor(uint32_t cursor) __attribute__ ((alias ("set_cursor")));
static inline static inline
int destroy_cursor(uint32_t cursor) int destroy_cursor(uint32_t cursor)
@ -397,6 +398,7 @@ int destroy_cursor(uint32_t cursor)
:"memory"); :"memory");
return ret; return ret;
}; };
static inline int DestroyCursor(uint32_t cursor) __attribute__ ((alias ("destroy_cursor")));
static inline void get_proc_info(char *info) static inline void get_proc_info(char *info)
{ {
@ -404,7 +406,8 @@ static inline void get_proc_info(char *info)
"int $0x40" "int $0x40"
: :
:"a"(9), "b"(info), "c"(-1)); :"a"(9), "b"(info), "c"(-1));
} };
static inline void GetProcInfo(char *info) __attribute__ ((alias ("get_proc_info")));
static inline static inline
void* user_realloc(void *mem, size_t size) void* user_realloc(void *mem, size_t size)
@ -417,8 +420,8 @@ void* user_realloc(void *mem, size_t size)
:"memory"); :"memory");
return val; return val;
} };
static inline void* UserRrealloc(void *mem, size_t size) __attribute__ ((alias ("user_realloc")));
void *get_resource(void *data, uint32_t id); void *get_resource(void *data, uint32_t id);