Better yaml formatting of item debug print

redhog · May 16, 2024 · a829296 · a829296
1 parent 4456a27
commit a829296
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 25 deletions.
diff --git a/glass-renderer/item.c b/glass-renderer/item.c
@@ -483,13 +483,13 @@ void item_print_meta(Item *item, int indent, FILE *fp) {
             indentstr,
             item->is_mapped ? "true" : "false");
   }
-  fprintf(fp, "%s  attrs: %s, geom: %s, glxpixmap: %s, texture: %s\n",
+  fprintf(fp, "%s  loaded: {attrs: %s, geom: %s, glxpixmap: %s, texture: %s}\n",
           indentstr,
-          item->attr ? "Y" : "-",
-          item->geom ? "Y" : "-",
-          item->window_pixmap != None ? "Y" : "-",
-          item->window_texture.glxpixmap != 0 ? "Y" : "-",
-          item->window_texture.texture_id != 0 ? "Y" : "-"
+          item->attr ? "Y" : "N",
+          item->geom ? "Y" : "N",
+          item->window_pixmap != None ? "Y" : "N",
+          item->window_texture.glxpixmap != 0 ? "Y" : "N",
+          item->window_texture.texture_id != 0 ? "Y" : "N"
           );
   if (item->prop_size) {
     long width = item->prop_size->values.dwords[0];

diff --git a/glass-renderer/property.c b/glass-renderer/property.c
@@ -146,9 +146,9 @@ void property_print(Property *prop, int indent, FILE *fp, int detail) {
   } else {
     char *type_name = XGetAtomName(display, prop->type);
     if (type_name) {
-      fprintf(fp, "%s%s: !%s null\n", get_indent(indent), prop->name_str, type_name);
+      fprintf(fp, "%s%s: !%s\n", get_indent(indent), prop->name_str, type_name);
     } else {
-      fprintf(fp, "%s%s: null\n", get_indent(indent), prop->name_str);
+      fprintf(fp, "%s%s:\n", get_indent(indent), prop->name_str);
     }
     XFree(type_name);
   }

diff --git a/glass-renderer/property_atom.c b/glass-renderer/property_atom.c
@@ -31,7 +31,7 @@ void property_atom_to_gl(Property *prop, Rendering *rendering) {
   }
 }
 void property_atom_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !atom [", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !ATOM [", get_indent(indent), prop->name_str);
   for (int i = 0; i <prop->nitems; i++) {
     if (i > 0) fprintf(fp, ", ");
     char *name = XGetAtomName(display, (Atom) prop->values.dwords[i]);

diff --git a/glass-renderer/property_coords.c b/glass-renderer/property_coords.c
@@ -161,13 +161,18 @@ void property_coords_to_gl(Property *prop, Rendering *rendering) {
 }
 
 void property_coords_print(Property *prop, int indent, FILE *fp, int detail) {
+  int limit = (detail == 0 && prop->nitems > 10) ? 10 : prop->nitems;
   float *values = (float *) prop->data;
-  fprintf(fp, "%s%s: !coords [", get_indent(indent), prop->name_str);
-  for (int i = 0; i <prop->nitems; i++) {
+  fprintf(fp, "%s%s: !COORDS [", get_indent(indent), prop->name_str);
+  for (int i = 0; i < limit; i++) {
     if (i > 0) fprintf(fp, ", ");
     fprintf(fp, "%f", values[i]);
   }
-  fprintf(fp, "]\n");
+  if (limit < prop->nitems) {
+    fprintf(fp, "] # Truncated\n");
+  } else {
+    fprintf(fp, "]\n");
+  }
 }
 void property_coords_load_program(Property *prop, Rendering *rendering) {
   PropertyProgramCache *prop_cache = &prop->programs[rendering->program_cache_idx];

diff --git a/glass-renderer/property_float.c b/glass-renderer/property_float.c
@@ -58,12 +58,17 @@ void property_float_to_gl(Property *prop, Rendering *rendering) {
 }
 void property_float_print(Property *prop, int indent, FILE *fp, int detail) {
   float *values = (float *) prop->values.dwords;
-  fprintf(fp, "%s%s: !float [", get_indent(indent), prop->name_str);
-  for (int i = 0; i <prop->nitems; i++) {
+  int limit = (detail == 0 && prop->nitems > 10) ? 10 : prop->nitems;
+  fprintf(fp, "%s%s: !FLOAT [", get_indent(indent), prop->name_str);
+  for (int i = 0; i < limit; i++) {
     if (i > 0) fprintf(fp, ", ");
     fprintf(fp, "%f", values[i]);
   }
-  fprintf(fp, "]\n");
+  if (limit < prop->nitems) {
+    fprintf(fp, "] # Truncated\n");
+  } else {
+    fprintf(fp, "]\n");
+  }
 }
 void property_float_load_program(Property *prop, Rendering *rendering) {
   PropertyProgramCache *prop_cache = &prop->programs[rendering->program_cache_idx];

diff --git a/glass-renderer/property_int.c b/glass-renderer/property_int.c
@@ -32,12 +32,17 @@ void property_int_to_gl(Property *prop, Rendering *rendering) {
   }
 }
 void property_int_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !int [", get_indent(indent), prop->name_str);
-  for (int i = 0; i <prop->nitems; i++) {
+  int limit = (detail == 0 && prop->nitems > 10) ? 10 : prop->nitems;
+  fprintf(fp, "%s%s: !INTEGER [", get_indent(indent), prop->name_str);
+  for (int i = 0; i < limit; i++) {
     if (i > 0) fprintf(fp, ", ");
     fprintf(fp, "%i", prop->values.dwords[i]);
   }
-  fprintf(fp, "]\n");
+  if (limit < prop->nitems) {
+    fprintf(fp, "] # Truncated\n");
+  } else {
+    fprintf(fp, "]\n");
+  }
 }
 void property_int_load_program_none(Property *prop, Rendering *rendering) {}
 void property_int_load_program_print(Property *prop, Rendering *rendering) {

diff --git a/glass-renderer/property_item.c b/glass-renderer/property_item.c
@@ -10,7 +10,7 @@ void property_item_load(Property *prop) {}
 void property_item_free(Property *prop) {}
 void property_item_to_gl(Property *prop, Rendering *rendering) {}
 void property_item_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !item [", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !ITEM [", get_indent(indent), prop->name_str);
   for (int i = 0; i <prop->nitems; i++) {
     if (i > 0) fprintf(fp, ", ");
     fprintf(fp, "%d", prop->values.dwords[i]);

diff --git a/glass-renderer/property_net_wm_icon.c b/glass-renderer/property_net_wm_icon.c
@@ -43,7 +43,7 @@ void property_net_wm_icon_to_gl(Property *prop, Rendering *rendering) {
   rendering->texture_unit++;
 }
 void property_net_wm_icon_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !_NET_WM_ICON null\n", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !_NET_WM_ICON\n", get_indent(indent), prop->name_str);
 }
 void property_net_wm_load_program(Property *prop, Rendering *rendering) {
   PropertyProgramCache *prop_cache = &prop->programs[rendering->program_cache_idx];

diff --git a/glass-renderer/property_shaders.c b/glass-renderer/property_shaders.c
@@ -28,7 +28,7 @@ void property_shaders_print(Property *prop, int indent, FILE *fp, int detail) {
   if (prop->type == XA_ATOM) {
    property_atom_print(prop, indent, fp, detail);
   } else if (prop->type == XA_STRING) {
-    fprintf(fp, "%s%s: !shader_program null\n", get_indent(indent), prop->name_str);
+    fprintf(fp, "%s%s: !SHADER\n", get_indent(indent), prop->name_str);
   }
 }
 

diff --git a/glass-renderer/property_svg.c b/glass-renderer/property_svg.c
@@ -231,7 +231,7 @@ void property_svg_to_gl(Property *prop, Rendering *rendering) {
   GL_CHECK_ERROR("property_svg_to_gl2", "%ld", prop->window);
 }
 void property_svg_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !svg null\n", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !SVG\n", get_indent(indent), prop->name_str);
 }
 void property_svg_load_program(Property *prop, Rendering *rendering) {
   PropertyProgramCache *prop_cache = &prop->programs[rendering->program_cache_idx];

diff --git a/glass-renderer/property_window.c b/glass-renderer/property_window.c
@@ -32,7 +32,7 @@ void property_window_to_gl(Property *prop, Rendering *rendering) {
   }
 }
 void property_window_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !window [", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !WINDOW [", get_indent(indent), prop->name_str);
   for (int i = 0; i <prop->nitems; i++) {
     if (i > 0) fprintf(fp, ", ");
     fprintf(fp, "%d", prop->values.dwords[i]);

diff --git a/glass-renderer/property_wm_hints_icon.c b/glass-renderer/property_wm_hints_icon.c
@@ -70,7 +70,7 @@ void property_wm_hints_icon_to_gl(Property *prop, Rendering *rendering) {
   }
 }
 void property_wm_hints_icon_print(Property *prop, int indent, FILE *fp, int detail) {
-  fprintf(fp, "%s%s: !WM_HINTS null\n", get_indent(indent), prop->name_str);
+  fprintf(fp, "%s%s: !WM_HINTS\n", get_indent(indent), prop->name_str);
 }
 void property_wm_hints_load_program(Property *prop, Rendering *rendering) {
   PropertyProgramCache *prop_cache = &prop->programs[rendering->program_cache_idx];

diff --git a/glass-renderer/wm.c b/glass-renderer/wm.c
@@ -284,7 +284,7 @@ Bool main_event_handler_function(EventHandler *handler, XEvent *event) {
     fflush(stdout);    
   } else if (event->type == ClientMessage && event->xclient.message_type == ATOM("IG_DEBUG_LIST_ITEMS")) {
     printf("---\n");
-    print_items(INT_MAX);
+    print_items(2);
     printf("...\n");
     fflush(stdout);
   } else if (event->type == ClientMessage && event->xclient.message_type == ATOM("IG_EXIT")) {