WebSVN – Kolibri OS – Diff – /contrib/C_Layer/INCLUDE/kolibri_editor.h

 };
 static struct editor_syntax_file default_syntax = {
 ,     //count_colors_text
-,      // count_key_words dd (f1-text)/48
+,      // count_key_words dd (f1-text)/48, minimum 1
 xf1fcd0, //color_cursor dd 0xf1fcd0
 x080808, //color_wnd_capt dd 0x080808
 x1C1C1C, //color_wnd_work dd 0x1C1C1C
 extern void (*ted_but_sumb_upper_asm)(editor *) __attribute__((__stdcall__));
 static inline void editor_selected_toupper(editor *ed)
+{
     __asm__ __volatile__ (
-             "push edi \n\t"
+             "push %%edi \n\t"
-             "push esi \n\t":::);
+             "push %%esi \n\t":::);
     (*ted_but_sumb_upper_asm)(ed);
     __asm__ __volatile__ (
-             "pop esi \n\t"
+             "pop %%esi \n\t"
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
+}
 extern void (*ted_but_sumb_lover_asm)(editor *) __attribute__((__stdcall__));
 static inline void editor_selected_tolower(editor *ed)
+{
     __asm__ __volatile__ (
-             "push edi \n\t"
+             "push %%edi \n\t"
-             "push esi \n\t":::);
+             "push %%esi \n\t":::);
     (*ted_but_sumb_lover_asm)(ed);
     __asm__ __volatile__ (
-             "pop esi \n\t"
+             "pop %%esi \n\t"
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
 }
 extern void (*ted_but_convert_by_table_asm)(editor *, char* table) __attribute__((__stdcall__));
 static inline void editor_convert_by_table(editor *ed, char* table)
+{
     __asm__ __volatile__ (
-             "push edi \n\t"
+             "push %%edi \n\t"
-             "push esi \n\t":::);
+             "push %%esi \n\t":::);
     (*ted_but_convert_by_table_asm)(ed, table);
     __asm__ __volatile__ (
-             "pop esi \n\t"
+             "pop %%esi \n\t"
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
 }
 extern int (*ted_can_save_asm)(editor *) __attribute__((__stdcall__));
 static inline int editor_can_save(editor *ed)
-/// return 1 if can be saved
+/// return 1 if need to be saved (has changes), 0 otherwise
+{
     int ret;
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_can_save_asm)(ed);
     __asm__ __volatile__ (
-             "pop edi \n\t":"=a"(ret)::);
+             "pop %%edi \n\t":"=a"(ret)::);
     return ret;
+}
 extern void (*ted_clear_asm)(editor *, int) __attribute__((__stdcall__));
 static inline void editor_clear(editor *ed, int all)
 /// all==1 - clear all memory
+{
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_clear_asm)(ed, all);
     __asm__ __volatile__ (
 extern void (*ted_init_asm)(editor *) __attribute__((__stdcall__));
 static inline void editor_init(editor *ed)
 /// allocate memory
+{
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_init_asm)(ed);
     __asm__ __volatile__ (
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
+}
 extern int (*ted_is_select)(editor *) __attribute__((__stdcall__));
 static inline int editor_is_select(editor *ed)
 /// return 1 if have selection
 {
     int ret;
     __asm__ __volatile__ (
-             "push ebx \n\t":::);
+             "push %%ebx \n\t":::);
     (*ted_is_select)(ed);
     __asm__ __volatile__ (
 /// returns errcode as SysFn70
+{
     int     ret;
     struct fs_dirinfo   di;
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_open_file_asm)(ed, &di, fname);
     __asm__ __volatile__ (
-             "pop edi \n\t":"=b"(*readbytes), "=a"(ret)::);
+             "pop %%edi \n\t":"=b"(*readbytes), "=a"(ret)::);
     return ret;
+}
 extern void (*ted_but_cut)(editor *) __attribute__((__stdcall__));
 static inline void editor_cut(editor *ed)
+{
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_but_cut)(ed);
     __asm__ __volatile__ (
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
+}
 extern void (*ted_but_undo)(editor *) __attribute__((__stdcall__));
 static inline void editor_undo(editor *ed)
+{
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_but_undo)(ed);
     __asm__ __volatile__ (
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
+}
 extern void (*ted_but_redo)(editor *) __attribute__((__stdcall__));
 static inline void editor_redo(editor *ed)
+{
     __asm__ __volatile__ (
-             "push edi \n\t":::);
+             "push %%edi \n\t":::);
     (*ted_but_redo)(ed);
     __asm__ __volatile__ (
-             "pop edi \n\t":::);
+             "pop %%edi \n\t":::);
 }
 extern void (*ted_but_reverse)(editor *) __attribute__((__stdcall__));
 static inline void editor_reverse(editor *ed)
+{
     __asm__ __volatile__ (
     get_keyboard_layout(ly_opt, conv_table);
     editor_keyboard(ed, conv_table, ed_ctrl, get_key().val);
 }
-inline void gui_add_editor(kolibri_window *wnd, editor* e)
+static inline void gui_add_editor(kolibri_window *wnd, editor* e)
+{
     kolibri_window_add_element(wnd, KOLIBRI_EDITOR, e);
     ed->color_cur_text = 0xff0000;
     ed->color_wnd_text = 0xffff00;
 */
     ed->symbol_new_line = 20;  // ascii(20)
-    ed->scr_w = kolibri_new_scrollbar_def(0, 0, 100, 30, 0);
+    ed->scr_w = kolibri_new_scrollbar_def(X_Y(50, 16), X_Y(50, 300), 100, 30, 0);
-    ed->scr_h = kolibri_new_scrollbar_def(0, 0, 100, 30, 0);
+    ed->scr_h = kolibri_new_scrollbar_def(X_Y(0, 150), X_Y(50, 16), 100, 30, 0);
     ed->buffer_size = TE_BUF_SIZE;

Subversion Repositories Kolibri OS

(root)/contrib/C_Layer/INCLUDE/kolibri_editor.h – Rev 6589 → 6601