Added "libmsgbox" to ktcc.
Added examples for working with coff-libraries and "libmsgbox" to ktcc. Modified binutils to work normally via console.obj. git-svn-id: svn://kolibrios.org@8098 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
2f54c7de00
commit
df0d0be7d4
|
@ -0,0 +1,4 @@
|
||||||
|
These binaries are not built from the "/contrib/toolchain/binutils" folder.
|
||||||
|
This is a modification of Serge's original binutils.
|
||||||
|
Collected for output to console.obj and not debug board.
|
||||||
|
My fork page: "https://github.com/turbocat2001/binutils-kex"
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,55 @@
|
||||||
|
#ifndef KOLIBRI_MSGBOX_H
|
||||||
|
#define KOLIBRI_MSGBOX_H
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t retval; // 0 - win closed, 1 to n - button num, also default button on start
|
||||||
|
uint8_t reserv;
|
||||||
|
char texts[2048]; // must be enough ;-)
|
||||||
|
char msgbox_stack[1024];
|
||||||
|
uint32_t top_stack;
|
||||||
|
}__attribute__((packed)) msgbox;
|
||||||
|
|
||||||
|
typedef void (*msgbox_callback)(void);
|
||||||
|
|
||||||
|
extern void (*msgbox_create)(msgbox *, void *thread) __attribute__((__stdcall__)); // clears callbacks, ! if fix lib, we can return eax as of Fn51
|
||||||
|
extern void (*msgbox_setfunctions)(msgbox_callback*) __attribute__((__stdcall__)); // must be called immediately after create, zero-ended array
|
||||||
|
extern void (*msgbox_reinit)(msgbox *) __attribute__((__stdcall__)); // recalc sizes when structure changes, called auto when MsgBoxCreate
|
||||||
|
|
||||||
|
static inline msgbox* kolibri_new_msgbox(char* title, char* text, int def_but, ...)
|
||||||
|
/// text can be multilined by code 13 = "\r"
|
||||||
|
/// def_but - highlighted and used on Enter (if zero - default is [X]), user may use Tabs or Arrows
|
||||||
|
/// last params are buttons text, max 8. last must set as NULL
|
||||||
|
{
|
||||||
|
va_list vl=0;
|
||||||
|
va_start(vl, def_but);
|
||||||
|
msgbox* box = calloc(sizeof(msgbox), 1);
|
||||||
|
box->retval = (uint8_t)def_but;
|
||||||
|
char *pc = box->texts;
|
||||||
|
strcpy(pc, title);
|
||||||
|
pc += strlen(title) + 1;
|
||||||
|
strcpy(pc, text);
|
||||||
|
pc += strlen(text) + 1;
|
||||||
|
char *but_text = va_arg(vl, char*);
|
||||||
|
while (but_text)
|
||||||
|
{
|
||||||
|
strcpy(pc, but_text);
|
||||||
|
pc += strlen(but_text) + 1;
|
||||||
|
but_text = va_arg(vl, char*);
|
||||||
|
}
|
||||||
|
|
||||||
|
va_end(vl);
|
||||||
|
return box;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void kolibri_start_msgbox(msgbox* box, msgbox_callback cb[])
|
||||||
|
{
|
||||||
|
(*msgbox_create)(box, &box->top_stack);
|
||||||
|
if (cb) (*msgbox_setfunctions)(cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -4,4 +4,6 @@
|
||||||
../tcc files.c /kolibrios/develop/tcc/lib/libck.a -o files
|
../tcc files.c /kolibrios/develop/tcc/lib/libck.a -o files
|
||||||
../tcc winbasics.c /kolibrios/develop/tcc/lib/libck.a -o winbasics
|
../tcc winbasics.c /kolibrios/develop/tcc/lib/libck.a -o winbasics
|
||||||
../tcc dynamic.c -lconsole -lhttp -linputbox -o dynamic
|
../tcc dynamic.c -lconsole -lhttp -linputbox -o dynamic
|
||||||
exit
|
../tcc load_coff.c -o load_coff -lck
|
||||||
|
../tcc msgbox.c -lck -lmsgbox -o msgbox
|
||||||
|
exit
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
#include <dlfcn.h>
|
||||||
|
|
||||||
|
/*Using the "coff" library in ktcc using "inputbox.obj" as an example*/
|
||||||
|
|
||||||
|
unsigned (*InputBox)(void* Buffer, char* Caption, char* Prompt, char* Default, unsigned long Flags, unsigned long BufferSize, void* RedrawProc);
|
||||||
|
|
||||||
|
void *InputBoxLib;
|
||||||
|
|
||||||
|
void load_coff()
|
||||||
|
{
|
||||||
|
InputBoxLib = dlopen("/sys/lib/inputbox.obj", RTLD_GLOBAL);
|
||||||
|
InputBox = dlsym(InputBoxLib,"InputBox");
|
||||||
|
}
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
load_coff();
|
||||||
|
char buffer[256];
|
||||||
|
InputBox(buffer, "Hay!", "How do you do?", "Hmm?", 10, 256, 0);
|
||||||
|
dlclose(InputBoxLib);
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
#include <kos/msgbox.h>
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
msgbox *msg1=NULL;
|
||||||
|
msg1 = kolibri_new_msgbox("MsgBoxTest", "Hello world!", 0, "ok");
|
||||||
|
kolibri_start_msgbox(msg1, NULL);
|
||||||
|
}
|
Loading…
Reference in New Issue