Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6611 → Rev 6612

/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
35,7 → 35,8
kos32-objcopy $@ -O binary
 
boardmsg: boardmsg.o
$(LD) $(LIBPATH) --subsystem native -o $@ $^ $(OBJPATH)/loadboxlib.obj $(LDFLAGS)
$(LD) $(LIBPATH) --subsystem native -o $@ $^ $(OBJPATH)/loadboxlib.obj $(LDFLAGS) -Map=boardmsg.map
# strip $@
kos32-objcopy $@ -O binary
 
dbutton_files: dbutton_files.o
/contrib/C_Layer/EXAMPLE/libguic_kolibri/boardmsg.c
69,9 → 69,7
debug_board_write_str("\n");
break;
}
press_key = key.val;
 
kolibri_handle_event_key(main_window);
kolibri_handle_event_key(main_window, key);
}
else if(gui_event == KOLIBRI_EVENT_BUTTON)
{
/contrib/C_Layer/EXAMPLE/libguic_kolibri/dbutton_files.c
109,7 → 109,6
brows.folder_data = read_folderdata("/rd/1");
brows.select_panel_counter = 1; // if want to show selection
 
int extended_key = 0, act = 0;
do /* Start of main activity loop */
{
switch(gui_event)
124,44 → 123,7
break;
case KOLIBRI_EVENT_KEY:
keypress = get_key();
if(keypress.state) break;
if (keypress.code == 0xE0){ extended_key = 1; break; }
 
act = 0;
switch(keypress.ctrl_key) // ascii scancode
{
case 80: // arrow down
act = 1; break;
case 72: // arrow up
act = 2; break;
case 81: // PageDown
act = 3; break;
case 73: // PageUp
act = 4; break;
case 71: // Home
act = 5; break;
case 79: // End
act = 6; break;
case 28: // Enter
act = 7; break;
case 82: // Insert
act = 8; break;
case 78: // NumPad+ select all
act = 9; break;
case 74: // NumPad- deselct
act = 10; break;
case 55: // NumPad* invert selection
act = 11; break;
default:
act = 12; // search by letter
}
brows.key_action = act;
brows.key_action_num = keypress.ctrl_key;
 
debug_board_printf("key pressed [%X] %d, action %d, ext_flag = %d\n", keypress.val, brows.key_action_num, act, extended_key);
 
if (extended_key) extended_key = 0;
(*filebrowse_key)(&brows);
filebrowser_key(&brows, keypress);
//kolibri_handle_event_key(main_window);
break;
case KOLIBRI_EVENT_BUTTON:
/contrib/C_Layer/EXAMPLE/libguic_kolibri/editor_tree_msgbox.c
28,6 → 28,15
char* load_file_inmem(char* fname, int32_t* read_sz); // see below
char* load_image_file(char* fname); // see below
 
void set_os_keyb_mode(int mode)
// 0 - ASCII, 1 - SCAN
{
__asm__ __volatile__(
"int $0x40"
::"a"(66), "b"(1), "c"(mode));
};
 
 
int main(int argc, char **argv)
{
/* Load all libraries, initialize global tables like system color table and
36,6 → 45,7
elements can be used after a successful call to this function
*/
kolibri_gui_init();
set_os_keyb_mode(1); // scan code mode needed for editor
// kolibri_proclib_init(); // opensave && color dialogs
kolibri_libimg_init(); // png handling
 
43,7 → 53,7
uint32_t pressed_button = 0;
// uint32_t mouse_button;
// pos_t mouse_pos;
oskey_t keypress;
// oskey_t keypress;
 
// make full path + argv
strcpy(run_path, argv[0]);
55,12 → 65,22
kolibri_window *main_window = kolibri_new_window(50, 40, 490, 500, "Editor, TreeView and MsgBox demo");
 
editor *ed;
editor *ed_lock;
void *ed_lock;
 
gui_add_editor(main_window, ed = kolibri_new_editor(X_Y(0, 440), X_Y(20, 150), 0x1001, 2048, &ed_lock));
gui_add_editor(main_window, ed = kolibri_new_editor(X_Y(0, 440), X_Y(20, 150), 0x11, 2048, &ed_lock)); // 0x11 font 8x16 sized x2
ed_lock = ed;
/*
// load sample file
int res, len;
res = editor_openfile(ed, "/rd/1/boardlog.txt", &len);
debug_board_printf("loaded sample file err=%d, len=%d\n", res, len);
*/
//adding sample text @cursor
char *sampletext = "==========ADDED SAMPLE TEXT==========\n";
(*ted_text_add)(ed, sampletext, strlen(sampletext), 0);
 
treelist *tl = kolibri_new_treelist(X_Y(0, 440), X_Y(200, 200), 16, X_Y(16, 16), 100, 50, 0, 0, TL_KEY_NO_EDIT | TL_DRAW_PAR_LINE, &ed_lock, 0x8080ff, 0x0000ff, 0xffffff);
// treelist as tree
treelist *tl = kolibri_new_treelist(X_Y(0, 200), X_Y(200, 200), 16, X_Y(16, 16), 100, 50, 0, 0, TL_KEY_NO_EDIT | TL_DRAW_PAR_LINE, &ed_lock, 0x8080ff, 0x0000ff, 0xffffff);
treelist_data_init(tl);
 
// ÷èòàåì ôàéë ñ êóðñîðàìè è ëèíèÿìè
75,9 → 95,17
 
treelist_node_add(tl, "node1", 1, 0, 0); // ãäå 1 íîìåð èêîíêè ñ êíèãîé
treelist_cursor_next(tl);
treelist_node_add(tl, "node1.1", 1, 0, 1);
treelist_cursor_next(tl);
treelist_node_add(tl, "node1.1.1", 0, 0, 2);
treelist_cursor_next(tl);
treelist_node_add(tl, "node1.2", 1, 0, 1);
treelist_cursor_next(tl);
 
treelist_node_add(tl, "node2", 1, 0, 0);
treelist_node_add(tl, "node2", 1, 1, 0); // closed node
treelist_cursor_next(tl);
treelist_node_add(tl, "node2.1", 1, 0, 1);
treelist_cursor_next(tl);
 
treelist_node_add(tl, "node3", 1, 0, 0);
treelist_cursor_next(tl);
85,8 → 113,28
treelist_cursor_begin(tl); //;ñòàâèì êóðñîð íà íà÷àëî ñïèñêà
gui_add_treelist(main_window, tl);
 
// treelist as listbox
treelist *tl2 = kolibri_new_treelist(X_Y(220, 200), X_Y(200, 200), 16, X_Y(16, 16), 100, 50, 0, 0, TL_LISTBOX_MODE, &ed_lock, 0x8080ff, 0x0000ff, 0xffffff);
treelist_data_init(tl2);
 
tl2->data_img_sys = tl->data_img_sys;
tl2->data_img = tl->data_img;
 
treelist_node_add(tl2, "list1", 0, 0, 0); // ãäå 1 íîìåð èêîíêè ñ êíèãîé
treelist_cursor_next(tl2);
 
treelist_node_add(tl2, "list2", 0, 0, 0);
treelist_cursor_next(tl2);
 
treelist_node_add(tl2, "list3", 0, 0, 0);
treelist_cursor_next(tl2);
 
treelist_cursor_begin(tl2); //;ñòàâèì êóðñîð íà íà÷àëî ñïèñêà
gui_add_treelist(main_window, tl2);
 
msgbox* box = kolibri_new_msgbox("Exit", "Are\rYOU\rSure?", 3, "YES", "Absolute", "Not Yet", NULL); // default NOT
 
oskey_t key;
do /* Start of main activity loop */
{
switch(gui_event)
99,10 → 147,20
case KOLIBRI_EVENT_NONE:
break;
case KOLIBRI_EVENT_KEY:
key = get_key();
trap(0x55); // for stop in debug
if (ed_lock == ed)
editor_key(ed);
editor_key(ed, key);
else if(ed_lock == tl)
{
treelist_key(tl, key);
}
else if(ed_lock == tl2)
{
treelist_key(tl2, key);
}
else
kolibri_handle_event_key(main_window);
kolibri_handle_event_key(main_window, key);
break;
case KOLIBRI_EVENT_BUTTON:
pressed_button = get_os_button();
/contrib/C_Layer/EXAMPLE/libguic_kolibri/option_menu.c
134,7 → 134,7
case KOLIBRI_EVENT_KEY:
keypress = get_key();
debug_board_printf("Key pressed state(%d) code(%d) ctrl_key(%d) modifiers(%#x)\n", keypress.state, keypress.code, keypress.ctrl_key, get_os_keyb_modifiers());
kolibri_handle_event_key(main_window); // ???????
kolibri_handle_event_key(main_window, keypress);
 
if(keypress.code == SCAN_CODE_ALTM && get_os_keyb_modifiers() & (KEY_LALT | KEY_RALT))
(*menu_bar_activate)(menu1); // wont work, immediately redraw command closes menu ( . but Alt+F1 worked in opendial.asm:463
/contrib/C_Layer/EXAMPLE/libguic_kolibri/scroll_progress.c
147,7 → 147,7
}
break;
}
kolibri_handle_event_key(main_window); // ???????
kolibri_handle_event_key(main_window, keypress);
break;
case KOLIBRI_EVENT_BUTTON:
pressed_button = get_os_button();