WebSVN – Kolibri OS – Path Comparison – / – /contrib/C_Layer/ Rev 6394 and /contrib/C

Regard whitespace Rev 6394 → Rev 6395

/contrib/C_Layer/libguic_kolibri/boardmsg.c
21,7 → 21,7
kolibri_window_add_element(main_window, KOLIBRI_CHECK_BOX, checkbox);
kolibri_window_add_element(main_window, KOLIBRI_BUTTON, button);

volatile unsigned press_key2;
volatile unsigned press_key;

do /* Start of main activity loop */
{
31,6 → 31,7
}
else if(gui_event == KOLIBRI_EVENT_KEY)
{
/* siemargl commented out because keys stealed from textinput
key = get_key();
switch (key.code)
{
43,6 → 44,7
break;
}
press_key = key.val;
*/
kolibri_handle_event_key(main_window);
}
else if(gui_event == KOLIBRI_EVENT_BUTTON)

/contrib/C_Layer/libguic_kolibri/kolibri_button.h
18,6 → 18,7
new_button -> color = color;
new_button -> identifier = identifier;
new_button -> XY = 0;
return new_button;
}

void draw_button(struct kolibri_button *some_button)

 /contrib/C_Layer/libguic_kolibri/kolibri_debug.h
 ,7 → 11,8
     :"a"(63), "b"(1), "c"(ch));
 }
-inline void debug_board_write_str(const char* str){
+//added noninline because incofortabre stepping in in debugger
+void __attribute__ ((noinline)) debug_board_write_str(const char* str){
   while(*str)
     debug_board_write_byte(*str++);
 }

 /contrib/C_Layer/libguic_kolibri/kolibri_gui.h
 ,7 → 1,7
 #ifndef KOLIBRI_GUI_H
 #define KOLIBRI_GUI_H
-#include "stdlib.h" /* for malloc() */
+#include <stdlib.h> /* for malloc() */
 #include <kos32sys.h>
 #include "kolibri_debug.h" /* work with debug board */
 ,6 → 41,8
           if(kolibri_gui_op_table[current_element -> type].redraw_fn)
             kolibri_gui_op_table[current_element -> type].redraw_fn(current_element -> element);
+//sie after fixing calling conventions no more needed
+/*
           switch(current_element -> type)
             {
             case KOLIBRI_EDIT_BOX:
 ,9 → 50,10
               __asm__ volatile("push $0x13371337"::); /* Random value pushed to balance stack */
                                                       /* otherwise edit_box_draw leaves stack unbalanced */
                                                       /* and GCC jumps like a crazy motha' fucka' */
               break;
             }
+*/
           current_element = current_element -> next;
         } while(current_element != some_window->elements); /* Have we covered all elements? */
 ,11 → 87,11
       do
         {
           if(kolibri_gui_op_table[current_element -> type].mouse_fn)
             kolibri_gui_op_table[current_element -> type].mouse_fn(current_element -> element);
           current_element = current_element -> next;
         } while(current_element != some_window->elements); /* Have we covered all elements? */
     }
 }
 ,6 → 124,8
   /* Also set filters so that window receives mouse events only when active
      and mouse inside window */
   __asm__ volatile("int $0x40"::"a"(40), "b"(0xC0000027));
+  return boxlib_init_status;
 }
 /* Note: The current implementation tries to automatically colors

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6394 → Rev 6395