(pitx): Don't use enum names, use their values. Remove reference to

non-existing value GET_FROM_COMPOSITION.
(pgx): Don't use enum names, use their values.
(pitmethod): New helper command.
(pitx): Use it to display iteration method.
(pgrowit): New command.

diff --git a/src/.gdbinit b/src/.gdbinit
index 5c7e6d8e5259fcf894fa60b60298c014b2345d28..6e717836376869d8f12db9d570f3936deaf7e644 100644 (file)
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -163,6 +163,35 @@ Print current buffer's point and boundaries.
 Prints values of point, beg, end, narrow, and gap for current buffer.
 end
 
+define pitmethod
+  set $itmethod = $arg0
+  # output $itmethod
+  if ($itmethod == 0)
+    printf "GET_FROM_BUFFER"
+  end
+  if ($itmethod == 1)
+    printf "GET_FROM_DISPLAY_VECTOR"
+  end
+  if ($itmethod == 2)
+    printf "GET_FROM_STRING"
+  end
+  if ($itmethod == 3)
+    printf "GET_FROM_C_STRING"
+  end
+  if ($itmethod == 4)
+    printf "GET_FROM_IMAGE"
+  end
+  if ($itmethod == 5)
+    printf "GET_FROM_STRETCH"
+  end
+  if ($itmethod < 0 || $itmethod > 5)
+    output $itmethod
+  end
+end
+document pitmethod
+Pretty print it->method given as first arg
+end
+
 # Print out iterator given as first arg
 define pitx
   set $it = $arg0
@@ -193,7 +222,7 @@ define pitx
   if ($it->sp != 0)
     printf " sp=%d", $it->sp
   end
-  if ($it->what == IT_CHARACTER)
+  if ($it->what == 0) # IT_CHARACTER
     if ($it->len == 1 && $it->c >= ' ' && it->c < 255)
       printf " ch='%c'", $it->c
     else
@@ -201,20 +230,41 @@ define pitx
     end
   else
     printf " "
-    output $it->what
+    # output $it->what
+    if ($it->what == 0)
+      printf "IT_CHARACTER"
+    end
+    if ($it->what == 1)
+      printf "IT_COMPOSITION"
+    end
+    if ($it->what == 2)
+      printf "IT_IMAGE"
+    end
+    if ($it->what == 3)
+      printf "IT_STRETCH"
+    end
+    if ($it->what == 4)
+      printf "IT_EOB"
+    end
+    if ($it->what == 5)
+      printf "IT_TRUNCATION"
+    end
+    if ($it->what == 6)
+      printf "IT_CONTINUATION"
+    end
+    if ($it->what < 0 || $it->what > 6)
+      output $it->what
+    end
   end
-  if ($it->method != GET_FROM_BUFFER)
+  if ($it->method != 0) # GET_FROM_BUFFER
     printf " next="
-    output $it->method
-    if ($it->method == GET_FROM_STRING)
+    pitmethod $it->method
+    if ($it->method == 2) # GET_FROM_STRING
       printf "[%d]", $it->current.string_pos.charpos
     end
-    if ($it->method == GET_FROM_IMAGE)
+    if ($it->method == 4) # GET_FROM_IMAGE
       printf "[%d]", $it->image_id
     end
-    if ($it->method == GET_FROM_COMPOSITION)
-      printf "[%d,%d,%d]", $it->cmp_id, $it->len, $it->cmp_len
-    end
   end
   printf "\n"
   if ($it->region_beg_charpos >= 0)
@@ -231,7 +281,7 @@ define pitx
   while ($i < $it->sp && $i < 4)
     set $e = $it->stack[$i]
     printf "stack[%d]: ", $i
-    output $e->method
+    pitmethod $e->method
     printf "[%d]", $e->position.charpos
     printf "\n"
     set $i = $i + 1
@@ -395,20 +445,24 @@ end
 
 define pgx
   set $g = $arg0
-  if ($g->type == CHAR_GLYPH)
+  # CHAR_GLYPH
+  if ($g->type == 0)
     if ($g->u.ch >= ' ' && $g->u.ch < 127)
       printf "CHAR[%c]", $g->u.ch
     else
       printf "CHAR[0x%x]", $g->u.ch
     end
   end
-  if ($g->type == COMPOSITE_GLYPH)
+  # COMPOSITE_GLYPH
+  if ($g->type == 1)
     printf "COMP[%d]", $g->u.cmp_id
   end
-  if ($g->type == IMAGE_GLYPH)
+  # IMAGE_GLYPH
+  if ($g->type == 2)
     printf "IMAGE[%d]", $g->u.img_id
   end
-  if ($g->type == STRETCH_GLYPH)
+  # STRETCH_GLYPH
+  if ($g->type == 3)
     printf "STRETCH[%d+%d]", $g->u.stretch.height, $g->u.stretch.ascent
   end
   xgettype ($g->object)
@@ -418,7 +472,8 @@ define pgx
     printf " pos=%d", $g->charpos
   end
   printf " w=%d a+d=%d+%d", $g->pixel_width, $g->ascent, $g->descent
-  if ($g->face_id != DEFAULT_FACE_ID)
+  # If not DEFAULT_FACE_ID
+  if ($g->face_id != 0)
     printf " face=%d", $g->face_id
   end
   if ($g->voffset)
@@ -509,6 +564,13 @@ document pgrow
 Pretty print all glyphs in row structure row.
 end
 
+define pgrowit
+  pgrowx it->glyph_row
+end
+document pgrowit
+Pretty print all glyphs in it->glyph_row.
+end
+
 define xtype
   xgettype $
   output $type

diff --git a/src/ChangeLog b/src/ChangeLog
index 9a411f83afca7f80254513cdb9e42badc933d4d9..3858492a0b491155d11cd85206c35395f5fcba3b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-19  Eli Zaretskii  <eliz@gnu.org>
 
+       * .gdbinit (pitx): Don't use enum names, use their values.  Remove
+       reference to non-existing value GET_FROM_COMPOSITION.
+       (pgx): Don't use enum names, use their values.
+       (pitmethod): New helper command.
+       (pitx): Use it to display iteration method.
+       (pgrowit): New command.
+
        * makefile.w32-in ($(BLD)/cmds.$(O)): Depend on frame.h.
 
        Update dependencies in Makefile.in.