4.0.19 casey stuff added

4coder_API/style.h

@@ -8,6 +8,9 @@ Stag_Back,
 Stag_Margin,
 Stag_Margin_Hover,
 Stag_Margin_Active,
+Stag_List_Item,
+Stag_List_Item_Hover,
+Stag_List_Item_Active,
 Stag_Cursor,
 Stag_At_Cursor,
 Stag_Highlight,

4cpp/4cpp_lexer.h

@@ -1285,7 +1285,6 @@ The start and end points are based on the edited region of the file before the e
     if (end_pos > array->tokens[range.end_token_index].start){
         ++range.end_token_index;
     }
-    //++range.end_token_index;
     if (range.end_token_index < 0){
         range.end_token_index = 0;
     }

4ed.cpp

@@ -606,6 +606,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF181818;
     style->main.margin_hover_color = 0xFF252525;
     style->main.margin_active_color = 0xFF323232;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFF00EE00;
     style->main.highlight_color = 0xFFDDEE00;
     style->main.mark_color = 0xFF494949;
@@ -645,6 +648,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF262626;
     style->main.margin_hover_color = 0xFF333333;
     style->main.margin_active_color = 0xFF404040;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFF40FF40;
     style->main.at_cursor_color = style->main.back_color;
     style->main.mark_color = 0xFF808080;
@@ -684,6 +690,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF1A2634;
     style->main.margin_hover_color = 0xFF2D415B;
     style->main.margin_active_color = 0xFF405D82;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFFEEE800;
     style->main.at_cursor_color = style->main.back_color;
     style->main.mark_color = 0xFF8BA8CC;
@@ -723,6 +732,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF111168;
     style->main.margin_hover_color = 0xFF191996;
     style->main.margin_active_color = 0xFF2121C3;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFF7082F9;
     style->main.at_cursor_color = 0xFF000014;
     style->main.mark_color = 0xFF4b5028;
@@ -762,6 +774,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF9E9E9E;
     style->main.margin_hover_color = 0xFF7E7E7E;
     style->main.margin_active_color = 0xFF5C5C5C;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFF000000;
     style->main.at_cursor_color = 0xFFD6D6D6;
     style->main.mark_color = 0xFF525252;
@@ -801,6 +816,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF383838;
     style->main.margin_hover_color = 0xFF404040;
     style->main.margin_active_color = 0xFF484848;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFFDDDDDD;
     style->main.at_cursor_color = 0xFF303030;
     style->main.mark_color = 0xFF808080;
@@ -840,6 +858,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF9E9E9E;
     style->main.margin_hover_color = 0xFF7E7E7E;
     style->main.margin_active_color = 0xFF5C5C5C;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFF000000;
     style->main.at_cursor_color = 0xFFD6D6D6;
     style->main.mark_color = 0xFF525252;
@@ -879,6 +900,9 @@ app_hardcode_styles(Models *models){
     style->main.margin_color = 0xFF606590;
     style->main.margin_hover_color = 0xFF606590;
     style->main.margin_active_color = 0xFF9a99e7;
+    style->main.list_item_color = style->main.margin_color;
+    style->main.list_item_hover_color = style->main.margin_hover_color;
+    style->main.list_item_active_color = style->main.margin_active_color;
     style->main.cursor_color = 0xFFd96e26;
     style->main.at_cursor_color = style->main.back_color;
     style->main.mark_color = 0xFF808080;

4ed_file_view.cpp

@@ -5738,9 +5738,8 @@ do_step_file_view(System_Functions *system, View *view, i32_Rect rect, b32 is_ac
                     {
                         GUI_Interactive *b = (GUI_Interactive*)h;
                         
-                        if (click_button_input(target, &gui_session, user_input,
+                        if (click_button_input(target, &gui_session, user_input, b, &result.is_animating)){
-                                               b, &result.is_animating)){
+                            result.consumed_l = true;
-                            result.consumed_l = 1;
                         }
                     }break;
                     
@@ -5749,9 +5748,8 @@ do_step_file_view(System_Functions *system, View *view, i32_Rect rect, b32 is_ac
                     {
                         GUI_Interactive *b = (GUI_Interactive*)h;
                         
-                        if (click_button_input(target, &gui_session, user_input,
+                        if (click_button_input(target, &gui_session, user_input, b, &result.is_animating)){
-                                               b, &result.is_animating)){
+                            result.consumed_l = true;
-                            result.consumed_l = 1;
                         }
                         
                         {
@@ -6270,15 +6268,15 @@ get_margin_color(i32 active_level, Style *style){
     
     switch (active_level){
         default:
-        margin = style->main.margin_color;
+        margin = style->main.list_item_color;
         break;
         
         case 1: case 2:
-        margin = style->main.margin_hover_color;
+        margin = style->main.list_item_hover_color;
         break;
         
         case 3: case 4:
-        margin = style->main.margin_active_color;
+        margin = style->main.list_item_active_color;
         break;
     }
     

4ed_style.h

@@ -11,6 +11,9 @@ u32 back_color;
 u32 margin_color;
 u32 margin_hover_color;
 u32 margin_active_color;
+u32 list_item_color;
+u32 list_item_hover_color;
+u32 list_item_active_color;
 u32 cursor_color;
 u32 at_cursor_color;
 u32 highlight_color;
@@ -49,6 +52,9 @@ case Stag_Back: result = &s->back_color; break;
 case Stag_Margin: result = &s->margin_color; break;
 case Stag_Margin_Hover: result = &s->margin_hover_color; break;
 case Stag_Margin_Active: result = &s->margin_active_color; break;
+case Stag_List_Item: result = &s->list_item_color; break;
+case Stag_List_Item_Hover: result = &s->list_item_hover_color; break;
+case Stag_List_Item_Active: result = &s->list_item_active_color; break;
 case Stag_Cursor: result = &s->cursor_color; break;
 case Stag_At_Cursor: result = &s->at_cursor_color; break;
 case Stag_Highlight: result = &s->highlight_color; break;

meta/4ed_metagen.cpp

@@ -150,6 +150,9 @@ static char* main_style_fields[] = {
     "margin",
     "margin_hover",
     "margin_active",
+    "list_item",
+    "list_item_hover",
+    "list_item_active",
     "cursor",
     "at_cursor",
     "highlight",

meta/build.cpp

@@ -485,8 +485,8 @@ static void
 standard_build(char *cdir, u32 flags){
     fsm_generator(cdir);
     metagen(cdir);
-    do_buildsuper(cdir, Custom_Experiments, flags);
+    //do_buildsuper(cdir, Custom_Experiments, flags);
-    //do_buildsuper(cdir, Custom_Casey, flags);
+    do_buildsuper(cdir, Custom_Casey, flags);
     //do_buildsuper(cdir, Custom_ChronalVim, flags);
     build_main(cdir, flags);
 }