Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 8384 → Rev 8385

/programs/other/tte/notify.h
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/programs/other/tte/Makefile
1,2 → 1,23
tte:
wine kos32-tcc.exe tte.c getline.c -lck -o tte
CC = kos32-gcc
LD = kos32-ld
 
SDK_DIR = $(abspath ../../../contrib/sdk)
 
CFLAGS = -c -fno-ident -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds --image-base 0
 
INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include
LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
default:
$(CC) $(CFLAGS) -O2 $(INCLUDES) getline.c
$(CC) $(CFLAGS) -O2 $(INCLUDES) -DGCC_BUILD tte.c
$(CC) $(CFLAGS) -O0 $(INCLUDES) notify.c
kos32-ld $(LDFLAGS) $(LIBPATH) --subsystem native -o tte getline.o tte.o notify.o -lgcc -lc.dll
objcopy tte -O binary
 
TCC:
kos32-tcc -DTCC_BUILD tte.c getline.c notify.c -lck -o tte -I ../../develop/ktcc/trunk/libc/include
 
clean:
rm *.o
/programs/other/tte/console_obj.h
0,0 → 1,141
// Console.obj loading for kos32-gcc
// Writed by rgimad and maxcodehack
 
#include <string.h>
#include <stdlib.h>
 
#ifndef CONSOLE_OBJ_H
#define CONSOLE_OBJ_H
 
#ifdef __cplusplus
extern "C" {
#endif
 
#ifndef NULL
#define NULL 0
#endif
 
#ifndef cdecl
#define cdecl __attribute__ ((cdecl))
#endif
 
#ifndef stdcall
#define stdcall __attribute__ ((stdcall))
#endif
 
typedef unsigned int dword;
typedef unsigned short word;
 
const char* imports[] = {
"START", "version", "con_init", "con_write_asciiz", "con_write_string",
"con_printf", "con_exit", "con_get_flags", "con_set_flags", "con_kbhit",
"con_getch", "con_getch2", "con_gets", "con_gets2", "con_get_font_height",
"con_get_cursor_height", "con_set_cursor_height", "con_cls",
"con_get_cursor_pos", "con_set_cursor_pos", "con_set_title",
(char*)0
};
 
dword *version;
 
typedef int (stdcall * con_gets2_callback)(int keycode, char** pstr, int* pn,
int* ppos);
 
void stdcall (*con_init)(dword wnd_width, dword wnd_height, dword scr_width, dword scr_height, const char* title) = 0;
void stdcall (*con_exit)(int bCloseWindow) = 0;
void stdcall (*con_set_title)(const char* title) = 0;
void stdcall (*con_write_asciiz)(const char* str) = 0;
void stdcall (*con_write_string)(const char* str, dword length) = 0;
int cdecl (*con_printf)(const char* format, ...) = 0;
dword stdcall (*con_get_flags)(void) = 0;
dword stdcall (*con_set_flags)(dword new_flags) = 0;
int stdcall (*con_get_font_height)(void) = 0;
int stdcall (*con_get_cursor_height)(void) = 0;
int stdcall (*con_set_cursor_height)(int new_height) = 0;
int stdcall (*con_getch)(void) = 0;
word stdcall (*con_getch2)(void) = 0;
int stdcall (*con_kbhit)(void) = 0;
char* stdcall (*con_gets)(char* str, int n) = 0;
char* stdcall (*con_gets2)(con_gets2_callback callback, char* str, int n) = 0;
void stdcall (*con_cls)() = 0;
void stdcall (*con_get_cursor_pos)(int* px, int* py) = 0;
void stdcall (*con_set_cursor_pos)(int x, int y) = 0;
 
const char lib_path[] = "/sys/lib/console.obj";
 
void* load_library(const char *name)
{
void *table;
__asm__ __volatile__(
"int $0x40"
:"=a"(table)
:"a"(68), "b"(19), "c"(name));
return table;
}
 
void *load_library_procedure(void *exports, const char *name)
{
if (exports == NULL) { return 0; }
while (*(dword*)exports != 0)
{
char *str1 = (char*)(*(dword*)exports);
if (strcmp(str1, name) == 0)
{
void *ptr = (void*)*(dword*)(exports + 4);
return ptr;
}
exports += 8;
}
return 0;
}
 
void output_debug_string(const char *s)
{
unsigned int i = 0;
while(*(s + i))
{
asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s + i)));
i++;
}
}
 
void load_console()
{
void *lib = load_library(lib_path);
 
if (!lib)
{
output_debug_string("Console.obj loading error\r\n");
exit(1);
}
 
dword (*start_lib)(dword) = (dword(*)(dword))load_library_procedure(lib, imports[0]);
 
version = (dword*)load_library_procedure(lib, imports[1]);
 
con_init = (void stdcall(*)(dword,dword,dword,dword,const char*))load_library_procedure(lib, imports[2]);
con_write_asciiz = (void stdcall(*)(const char*))load_library_procedure(lib, imports[3]);
con_write_string = (void stdcall(*)(const char*,dword))load_library_procedure(lib, imports[4]);
con_printf = (int cdecl(*)(const char*,...))load_library_procedure(lib, imports[5]);
con_exit = (void stdcall(*)(int))load_library_procedure(lib, imports[6]);
con_get_flags = (dword stdcall(*)(void))load_library_procedure(lib, imports[7]);
con_set_flags = (dword stdcall(*)(dword))load_library_procedure(lib, imports[8]);
con_kbhit = (int stdcall(*)(void))load_library_procedure(lib, imports[9]);
con_getch = (int stdcall(*)(void))load_library_procedure(lib, imports[10]);
con_getch2 = (word stdcall(*)(void))load_library_procedure(lib, imports[11]);
con_gets = (char* stdcall(*)(char*,int))load_library_procedure(lib, imports[12]);
con_gets2 = (char* stdcall(*)(con_gets2_callback,char*,int))load_library_procedure(lib, imports[13]);
con_get_font_height = (int stdcall(*)(void))load_library_procedure(lib, imports[14]);
con_get_cursor_height = (int stdcall(*)(void))load_library_procedure(lib, imports[15]);
con_set_cursor_height = (int stdcall(*)(int))load_library_procedure(lib, imports[16]);
con_cls = (void stdcall(*)(void))load_library_procedure(lib, imports[17]);
con_get_cursor_pos = (void stdcall(*)(int*,int*))load_library_procedure(lib, imports[18]);
con_set_cursor_pos = (void stdcall(*)(int,int))load_library_procedure(lib, imports[19]);
con_set_title = (void stdcall(*)(const char*))load_library_procedure(lib, imports[20]);
 
}
 
#ifdef __cplusplus
}
#endif
 
#endif
Property changes:
Added: svn:executable
+*
\ No newline at end of property
/programs/other/tte/notify.c
0,0 → 1,31
#include <string.h>
 
typedef unsigned int uint32_t;
 
static inline
int start_app(char *app_name, char *args){
#pragma pack(push, 1)
struct file_op_t
{
uint32_t fn;
uint32_t flags;
char* args;
uint32_t res1, res2;
char zero;
char* app_name __attribute__((packed));
} file_op;
#pragma pack(pop)
memset(&file_op, 0, sizeof(file_op));
file_op.fn = 7;
file_op.args = args;
file_op.app_name = app_name;
 
register int val;
asm volatile ("int $0x40":"=a"(val):"a"(70), "b"(&file_op));
 
return val;
}
 
void notify(char *text) {
start_app("/sys/@notify", text);
}
Property changes:
Added: svn:executable
+*
\ No newline at end of property
/programs/other/tte/tte.c
44,10 → 44,16
///#include <termios.h>
#include <time.h>
///#include <unistd.h>
 
#ifdef TCC_BUILD
#include <conio.h>
#endif
#ifdef GCC_BUILD
#include "console_obj.h"
#endif
 
/// Notify
#include "notify.h"
void notify(char *text);
 
 
/*** Define section ***/
504,10 → 510,10
 
case 6: // Ctrl+F
return CTRL_KEY('f');
 
/*
case 8: // Ctrl+H
return CTRL_KEY('h');
 
*/
case 24: // Ctrl+X
return CTRL_KEY('x');
1792,7 → 1798,15
}
 
int main(int argc, char* argv[]) {
#ifdef TCC_BUILD
con_init_console_dll_param(con_def_wnd_width, con_def_wnd_height, con_def_wnd_width, con_def_wnd_height, "TinyTextEditor");
#endif
#ifdef GCC_BUILD
load_console();
con_init(con_def_wnd_width, con_def_wnd_height, con_def_wnd_width, con_def_wnd_height, "TinyTextEditor");
#endif
initEditor();
int arg_response = handleArgs(argc, argv);
if (arg_response == 1) {