11 files changed, 442 insertions, 239 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f65301a7cd..ce03ac5ccda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,58 @@
+2004-03-26  Masatake YAMATO  <jet@gyve.org>
+
+        * insdel.c (adjust_markers_for_insert): Call
+        fix_start_end_in_overlays.
+
+        * buffer.c (fix_start_end_in_overlays): Rename
+        fix_overlays_in_range.
+
+        * editfns.c (Ftranspose_regions): Likewise.
+
+        * lisp.h (top_level): Likewise.
+
+2004-03-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (handle_one_xevent): Do not pass key press events to
+        GTK.
+
+2004-03-19  Richard M. Stallman  <rms@gnu.org>
+
+        * s/sol2-6.h: Delete previous change.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_in_display_line_to): Fix MOVE_TO_POS case when
+        to_charpos corresponds to newline in right fringe.  Use local
+        BUFFER_POS_REACHED_P macro.
+
+2004-03-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
+        to compile on non-window system.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (calc_pixel_width_or_height): Add prototype.
+
+        * image.c (Qcenter): Move to xdisp.c.
+
+        * xdisp.c (Qcenter): Declare here.
+        (syms_of_xdisp): intern and staticpro it.
+        (handle_single_display_prop): Allow space display property on all
+        platforms.
+        (display_mode_line): Set mode_line_p before displaying line.
+        (calc_pixel_width_or_height): Declare extern.  Add separate :align-to
+        handling.  Remove complex cases for fringes and scroll-bars.
+        Add left, right, and center alignment positions. Add text (area)
+        width/height.  Return width or height for image specs.
+        (produce_stretch_glyph): Improve handling of :align-to.  Is now
+        relative to left of text area by default, but other base offsets
+        can be specified -- also for text lines.
+
+        * term.c (produce_glyphs): Handle IT_STRETCH.
+        (produce_stretch_glyph): New function to handle space width and
+        align-to display properties on non-window systems.
+
 2004-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c (Fread_file_name): Set completion-ignore-case for
diff --git a/src/buffer.c b/src/buffer.c
index 27b12845c50..08031a0d72b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3293,7 +3293,7 @@ adjust_overlays_for_delete (pos, length)
    If so, we'll reverse the endpoints.  Can you think of anything
    better to do in this situation?  */
 void
-fix_overlays_in_range (start, end)
+fix_start_end_in_overlays (start, end)
      register int start, end;
 {
   Lisp_Object overlay;
diff --git a/src/dispextern.h b/src/dispextern.h
index 96e89a48b05..7056519e7bf 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -74,7 +74,6 @@ typedef XImagePtr XImagePtr_or_DC;
 #define NativeRectangle int
 #endif
 
-
 /* Structure forward declarations.  Some are here because function
    prototypes below reference structure types before their definition
    in this file.  Some are here because not every file including
@@ -2530,6 +2529,9 @@ extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
 extern int mouse_autoselect_window;
 
+extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object,
+                                           /* XFontStruct */ void *, int, int *));
+
 #ifdef HAVE_WINDOW_SYSTEM
 
 #if GLYPH_DEBUG
diff --git a/src/editfns.c b/src/editfns.c
index 51435af0bb2..df183155c4b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4157,7 +4157,7 @@ Transposing beyond buffer boundaries is an error.  */)
       transpose_markers (start1, end1, start2, end2,
                          start1_byte, start1_byte + len1_byte,
                          start2_byte, start2_byte + len2_byte);
-      fix_overlays_in_range (start1, end2);
+      fix_start_end_in_overlays (start1, end2);
     }
 
   return Qnil;
diff --git a/src/image.c b/src/image.c
index 23777dca253..34db5e53367 100644
--- a/src/image.c
+++ b/src/image.c
@@ -606,6 +606,7 @@ Lisp_Object Qxbm;
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
 extern Lisp_Object QCdata, QCtype;
+extern Lisp_Object Qcenter;
 Lisp_Object QCascent, QCmargin, QCrelief;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
@@ -613,7 +614,6 @@ Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
 /* Other symbols.  */
 
 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
-Lisp_Object Qcenter;
 
 /* Time in seconds after which images should be removed from the cache
    if not displayed.  */
@@ -7400,8 +7400,6 @@ syms_of_image ()
   staticpro (&Qedge_detection);
   Qheuristic = intern ("heuristic");
   staticpro (&Qheuristic);
-  Qcenter = intern ("center");
-  staticpro (&Qcenter);
 
   Qpostscript = intern ("postscript");
   staticpro (&Qpostscript);
diff --git a/src/insdel.c b/src/insdel.c
index 88bf1ddd085..5e3f69161e0 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -441,9 +441,13 @@ adjust_markers_for_insert (from, from_byte, to, to_byte, before_markers)
     }
 
   /* Adjusting only markers whose insertion-type is t may result in
-     disordered overlays in the slot `overlays_before'.  */
+     - disordered start and end in overlays, and 
+     - disordered overlays in the slot `overlays_before' of current_buffer.  */
   if (adjusted)
-    fix_overlays_before (current_buffer, from, to);
+    {
+      fix_start_end_in_overlays(from, to);
+      fix_overlays_before (current_buffer, from, to);
+    }
 }
 
 /* Adjust point for an insertion of NBYTES bytes, which are NCHARS characters.
diff --git a/src/lisp.h b/src/lisp.h
index cd873076602..2135f80f5e8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2656,7 +2656,7 @@ EXFUN (Foverlay_start, 1);
 EXFUN (Foverlay_end, 1);
 extern void adjust_overlays_for_insert P_ ((EMACS_INT, EMACS_INT));
 extern void adjust_overlays_for_delete P_ ((EMACS_INT, EMACS_INT));
-extern void fix_overlays_in_range P_ ((int, int));
+extern void fix_start_end_in_overlays P_ ((int, int));
 extern void report_overlay_modification P_ ((Lisp_Object, Lisp_Object, int,
                                              Lisp_Object, Lisp_Object, Lisp_Object));
 extern int overlay_touches_p P_ ((int));
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 3ba9ed1f5bd..a43443e48c2 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -7,10 +7,5 @@
 #define UNEXEC unexsol.o
 #endif
 
-/* "Dennis McRitchie" <dmcr@Princeton.EDU> reported failures
-   with GNU ld without this.  */
-
-#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-
 /* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
    (do not change this comment) */
diff --git a/src/term.c b/src/term.c
index f9d9dfce8c0..5d0c1fc7319 100644
--- a/src/term.c
+++ b/src/term.c
@@ -102,6 +102,10 @@ void delete_tty_output P_ ((struct frame *));
 
 #define OUTPUT1_IF(tty, a) do { if (a) emacs_tputs ((tty), a, 1, cmputc); } while (0)
 
+/* Display space properties */
+
+extern Lisp_Object Qspace, QCalign_to, QCwidth;
+
 /* Function to use to ring the bell.  */
 
 Lisp_Object Vring_bell_function;
@@ -1493,6 +1497,7 @@ term_get_fkeys_1 ()
  ***********************************************************************/
 
 static void append_glyph P_ ((struct it *));
+static void produce_stretch_glyph P_ ((struct it *));
 
 
 /* Append glyphs to IT's glyph_row.  Called from produce_glyphs for
@@ -1556,9 +1561,14 @@ produce_glyphs (it)
   /* If a hook is installed, let it do the work.  */
   xassert (it->what == IT_CHARACTER
            || it->what == IT_COMPOSITION
-           || it->what == IT_IMAGE
            || it->what == IT_STRETCH);
 
+  if (it->what == IT_STRETCH)
+    {
+      produce_stretch_glyph (it);
+      goto done;
+    }
+
   /* Nothing but characters are supported on terminal frames.  For a
      composition sequence, it->c is the first character of the
      sequence.  */
@@ -1632,6 +1642,7 @@ produce_glyphs (it)
         append_glyph (it);
     }
 
+ done:
   /* Advance current_x by the pixel width as a convenience for
      the caller.  */
   if (it->area == TEXT_AREA)
@@ -1641,6 +1652,81 @@ produce_glyphs (it)
 }
 
 
+/* Produce a stretch glyph for iterator IT.  IT->object is the value
+   of the glyph property displayed.  The value must be a list
+   `(space KEYWORD VALUE ...)' with the following KEYWORD/VALUE pairs
+   being recognized:
+
+   1. `:width WIDTH' specifies that the space should be WIDTH *
+   canonical char width wide.  WIDTH may be an integer or floating
+   point number.
+
+   2. `:align-to HPOS' specifies that the space should be wide enough
+   to reach HPOS, a value in canonical character units.  */
+
+static void
+produce_stretch_glyph (it)
+     struct it *it;
+{
+  /* (space :width WIDTH ...)  */
+  Lisp_Object prop, plist;
+  int width = 0, align_to = -1;
+  int zero_width_ok_p = 0;
+  double tem;
+
+  /* List should start with `space'.  */
+  xassert (CONSP (it->object) && EQ (XCAR (it->object), Qspace));
+  plist = XCDR (it->object);
+
+  /* Compute the width of the stretch.  */
+  if ((prop = Fplist_get (plist, QCwidth), !NILP (prop))
+      && calc_pixel_width_or_height (&tem, it, prop, 0, 1, 0))
+    {
+      /* Absolute width `:width WIDTH' specified and valid.  */
+      zero_width_ok_p = 1;
+      width = (int)(tem + 0.5);
+    }
+  else if ((prop = Fplist_get (plist, QCalign_to), !NILP (prop))
+           && calc_pixel_width_or_height (&tem, it, prop, 0, 1, &align_to))
+    {
+      if (it->glyph_row == NULL || !it->glyph_row->mode_line_p)
+        align_to = (align_to < 0 
+                    ? 0
+                    : align_to - window_box_left_offset (it->w, TEXT_AREA));
+      else if (align_to < 0)
+        align_to = window_box_left_offset (it->w, TEXT_AREA);
+      width = max (0, (int)(tem + 0.5) + align_to - it->current_x);
+      zero_width_ok_p = 1;
+    }
+  else
+    /* Nothing specified -> width defaults to canonical char width.  */
+    width = FRAME_COLUMN_WIDTH (it->f);
+
+  if (width <= 0 && (width < 0 || !zero_width_ok_p))
+    width = 1;
+
+  if (width > 0 && it->glyph_row)
+    {
+      Lisp_Object o_object = it->object;
+      Lisp_Object object = it->stack[it->sp - 1].string;
+      int n = width;
+      int c = it->c;
+
+      if (!STRINGP (object))
+        object = it->w->buffer;
+      it->object = object;
+      it->c = ' ';
+      it->pixel_width = it->len = 1;
+      while (n--)
+        append_glyph (it);
+      it->object = o_object;
+      it->c = c;
+    }
+  it->pixel_width = width;
+  it->nglyphs = width;
+}
+
+
 /* Get information about special display element WHAT in an
    environment described by IT.  WHAT is one of IT_TRUNCATION or
    IT_CONTINUATION.  Maybe produce glyphs for WHAT if IT has a
diff --git a/src/xdisp.c b/src/xdisp.c
index 796c7d06ce8..8fd0763590a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -301,6 +301,7 @@ extern Lisp_Object Qface, Qinvisible, Qwidth;
 Lisp_Object Vdisplay_pixels_per_inch;
 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
+Lisp_Object Qcenter;
 Lisp_Object Qmargin, Qpointer;
 extern Lisp_Object Qheight;
 extern Lisp_Object QCwidth, QCheight, QCascent;
@@ -3603,16 +3604,11 @@ handle_single_display_prop (it, prop, object, position,
           value = prop;
         }
 
+      valid_p = (STRINGP (value)
 #ifdef HAVE_WINDOW_SYSTEM
-      if (FRAME_TERMCAP_P (it->f))
-        valid_p = STRINGP (value);
-      else
-        valid_p = (STRINGP (value)
-                   || (CONSP (value) && EQ (XCAR (value), Qspace))
-                   || valid_image_p (value));
-#else /* not HAVE_WINDOW_SYSTEM */
-      valid_p = STRINGP (value);
+                 || (!FRAME_TERMCAP_P (it->f) && valid_image_p (value))
 #endif /* not HAVE_WINDOW_SYSTEM */
+                 || (CONSP (value) && EQ (XCAR (value), Qspace)));
 
       if ((EQ (location, Qleft_margin)
            || EQ (location, Qright_margin)
@@ -5594,15 +5590,18 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
   saved_glyph_row = it->glyph_row;
   it->glyph_row = NULL;
 
+#define BUFFER_POS_REACHED_P()                      \
+  ((op & MOVE_TO_POS) != 0                          \
+   && BUFFERP (it->object)                          \
+   && IT_CHARPOS (*it) >= to_charpos)
+
   while (1)
     {
       int x, i, ascent = 0, descent = 0;
 
       /* Stop when ZV or TO_CHARPOS reached.  */
       if (!get_next_display_element (it)
-          || ((op & MOVE_TO_POS) != 0
-              && BUFFERP (it->object)
-              && IT_CHARPOS (*it) >= to_charpos))
+          || BUFFER_POS_REACHED_P ())
         {
           result = MOVE_POS_MATCH_OR_ZV;
           break;
@@ -5689,7 +5688,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
 #ifdef HAVE_WINDOW_SYSTEM
                           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
-                              if (!get_next_display_element (it))
+                              if (!get_next_display_element (it)
+                                  || BUFFER_POS_REACHED_P ())
                                 {
                                   result = MOVE_POS_MATCH_OR_ZV;
                                   break;
@@ -5761,7 +5761,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
 #ifdef HAVE_WINDOW_SYSTEM
           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
             {
-              if (!get_next_display_element (it))
+              if (!get_next_display_element (it)
+                  || BUFFER_POS_REACHED_P ())
                 {
                   result = MOVE_POS_MATCH_OR_ZV;
                   break;
@@ -5778,6 +5779,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
         }
     }
 
+#undef BUFFER_POS_REACHED_P
+
   /* Restore the iterator settings altered at the beginning of this
      function.  */
   it->glyph_row = saved_glyph_row;
@@ -15064,6 +15067,8 @@ display_mode_line (w, face_id, format)
   init_iterator (&it, w, -1, -1, NULL, face_id);
   prepare_desired_row (it.glyph_row);
 
+  it.glyph_row->mode_line_p = 1;
+
   if (! mode_line_inverse_video)
     /* Force the mode-line to be displayed in the default face.  */
     it.base_face_id = it.face_id = DEFAULT_FACE_ID;
@@ -15080,7 +15085,6 @@ display_mode_line (w, face_id, format)
 
   compute_line_metrics (&it);
   it.glyph_row->full_width_p = 1;
-  it.glyph_row->mode_line_p = 1;
   it.glyph_row->continued_p = 0;
   it.glyph_row->truncated_on_left_p = 0;
   it.glyph_row->truncated_on_right_p = 0;
@@ -16694,6 +16698,252 @@ invisible_p (propval, list)
   return 0;
 }
 
+/* Calculate a width or height in pixels from a specification using
+   the following elements:
+
+   SPEC ::= 
+     NUM      - a (fractional) multiple of the default font width/height
+     (NUM)    - specifies exactly NUM pixels
+     UNIT     - a fixed number of pixels, see below.
+     ELEMENT  - size of a display element in pixels, see below.
+     (NUM . SPEC) - equals NUM * SPEC
+     (+ SPEC SPEC ...)  - add pixel values
+     (- SPEC SPEC ...)  - subtract pixel values
+     (- SPEC)           - negate pixel value
+
+   NUM ::= 
+     INT or FLOAT   - a number constant
+     SYMBOL         - use symbol's (buffer local) variable binding.
+
+   UNIT ::=
+     in       - pixels per inch  *)
+     mm       - pixels per 1/1000 meter  *)
+     cm       - pixels per 1/100 meter   *)
+     width    - width of current font in pixels.
+     height   - height of current font in pixels.
+
+     *) using the ratio(s) defined in display-pixels-per-inch.
+
+   ELEMENT ::=
+
+     left-fringe          - left fringe width in pixels
+     right-fringe         - right fringe width in pixels
+
+     left-margin          - left margin width in pixels
+     right-margin         - right margin width in pixels
+
+     scroll-bar           - scroll-bar area width in pixels
+
+   Examples:
+
+   Pixels corresponding to 5 inches:
+     (5 . in)     
+                
+   Total width of non-text areas on left side of window (if scroll-bar is on left):
+     '(space :width (+ left-fringe left-margin scroll-bar))
+
+   Align to first text column (in header line):
+     '(space :align-to 0)
+
+   Align to middle of text area minus half the width of variable `my-image' 
+   containing a loaded image:
+     '(space :align-to (0.5 . (- text my-image)))
+
+   Width of left margin minus width of 1 character in the default font:
+     '(space :width (- left-margin 1))
+
+   Width of left margin minus width of 2 characters in the current font:
+     '(space :width (- left-margin (2 . width)))
+
+   Center 1 character over left-margin (in header line):
+     '(space :align-to (+ left-margin (0.5 . left-margin) -0.5))
+
+   Different ways to express width of left fringe plus left margin minus one pixel:
+     '(space :width (- (+ left-fringe left-margin) (1)))
+     '(space :width (+ left-fringe left-margin (- (1))))
+     '(space :width (+ left-fringe left-margin (-1)))
+
+*/
+
+#define NUMVAL(X)                               \
+     ((INTEGERP (X) || FLOATP (X))              \
+      ? XFLOATINT (X)                           \
+      : - 1)
+
+int
+calc_pixel_width_or_height (res, it, prop, font, width_p, align_to)
+     double *res;
+     struct it *it;
+     Lisp_Object prop;
+     void *font;
+     int width_p, *align_to;
+{
+  double pixels;
+
+#define OK_PIXELS(val) ((*res = (double)(val)), 1)
+#define OK_ALIGN_TO(val) ((*align_to = (int)(val)), 1)
+
+  if (NILP (prop))
+    return OK_PIXELS (0);
+
+  if (SYMBOLP (prop))
+    {
+      if (SCHARS (SYMBOL_NAME (prop)) == 2)
+        {
+          char *unit =  SDATA (SYMBOL_NAME (prop));
+
+          if (unit[0] == 'i' && unit[1] == 'n')
+            pixels = 1.0;
+          else if (unit[0] == 'm' && unit[1] == 'm')
+            pixels = 25.4;
+          else if (unit[0] == 'c' && unit[1] == 'm')
+            pixels = 2.54;
+          else
+            pixels = 0;
+          if (pixels > 0)
+            {
+              double ppi;
+              if ((ppi = NUMVAL (Vdisplay_pixels_per_inch), ppi > 0)
+                  || (CONSP (Vdisplay_pixels_per_inch)
+                      && (ppi = (width_p
+                                 ? NUMVAL (XCAR (Vdisplay_pixels_per_inch))
+                                 : NUMVAL (XCDR (Vdisplay_pixels_per_inch))),
+                          ppi > 0)))
+                return OK_PIXELS (ppi / pixels);
+
+              return 0;
+            }
+        }
+
+#ifdef HAVE_WINDOW_SYSTEM
+      if (EQ (prop, Qheight))
+        return OK_PIXELS (font ? FONT_HEIGHT ((XFontStruct *)font) : FRAME_LINE_HEIGHT (it->f));
+      if (EQ (prop, Qwidth))
+        return OK_PIXELS (font ? FONT_WIDTH ((XFontStruct *)font) : FRAME_COLUMN_WIDTH (it->f));
+#else
+      if (EQ (prop, Qheight) || EQ (prop, Qwidth))
+        return OK_PIXELS (1);
+#endif
+
+      if (EQ (prop, Qtext))
+          return OK_PIXELS (width_p
+                            ? window_box_width (it->w, TEXT_AREA)
+                            : WINDOW_BOX_HEIGHT_NO_MODE_LINE (it->w));
+
+      if (align_to && *align_to < 0)
+        {
+          *res = 0;
+          if (EQ (prop, Qleft))
+            return OK_ALIGN_TO (window_box_left_offset (it->w, TEXT_AREA));
+          if (EQ (prop, Qright))
+            return OK_ALIGN_TO (window_box_right_offset (it->w, TEXT_AREA));
+          if (EQ (prop, Qcenter))
+            return OK_ALIGN_TO (window_box_left_offset (it->w, TEXT_AREA)
+                                + window_box_width (it->w, TEXT_AREA) / 2);
+          if (EQ (prop, Qleft_fringe))
+            return OK_ALIGN_TO (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (it->w)
+                                ? WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (it->w)
+                                : window_box_right_offset (it->w, LEFT_MARGIN_AREA));
+          if (EQ (prop, Qright_fringe))
+            return OK_ALIGN_TO (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (it->w)
+                                ? window_box_right_offset (it->w, RIGHT_MARGIN_AREA)
+                                : window_box_right_offset (it->w, TEXT_AREA));
+          if (EQ (prop, Qleft_margin))
+            return OK_ALIGN_TO (window_box_left_offset (it->w, LEFT_MARGIN_AREA));
+          if (EQ (prop, Qright_margin))
+            return OK_ALIGN_TO (window_box_left_offset (it->w, RIGHT_MARGIN_AREA));
+          if (EQ (prop, Qscroll_bar))
+            return OK_ALIGN_TO (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (it->w)
+                                ? 0
+                                : (window_box_right_offset (it->w, RIGHT_MARGIN_AREA)
+                                   + (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (it->w)
+                                      ? WINDOW_RIGHT_FRINGE_WIDTH (it->w)
+                                      : 0)));
+        }
+      else
+        {
+          if (EQ (prop, Qleft_fringe))
+            return OK_PIXELS (WINDOW_LEFT_FRINGE_WIDTH (it->w));
+          if (EQ (prop, Qright_fringe))
+            return OK_PIXELS (WINDOW_RIGHT_FRINGE_WIDTH (it->w));
+          if (EQ (prop, Qleft_margin))
+            return OK_PIXELS (WINDOW_LEFT_MARGIN_WIDTH (it->w));
+          if (EQ (prop, Qright_margin))
+            return OK_PIXELS (WINDOW_RIGHT_MARGIN_WIDTH (it->w));
+          if (EQ (prop, Qscroll_bar))
+            return OK_PIXELS (WINDOW_SCROLL_BAR_AREA_WIDTH (it->w));
+        }
+
+      prop = Fbuffer_local_value (prop, it->w->buffer);
+    }
+
+  if (INTEGERP (prop) || FLOATP (prop))
+    {
+      int base_unit = (width_p
+                       ? FRAME_COLUMN_WIDTH (it->f)
+                       : FRAME_LINE_HEIGHT (it->f));
+      return OK_PIXELS (XFLOATINT (prop) * base_unit);
+    }
+
+  if (CONSP (prop))
+    {
+      Lisp_Object car = XCAR (prop);
+      Lisp_Object cdr = XCDR (prop);
+
+      if (SYMBOLP (car))
+        {
+#ifdef HAVE_WINDOW_SYSTEM
+          if (valid_image_p (prop))
+            {
+              int id = lookup_image (it->f, prop);
+              struct image *img = IMAGE_FROM_ID (it->f, id);
+
+              return OK_PIXELS (width_p ? img->width : img->height);
+            }
+#endif
+          if (EQ (car, Qplus) || EQ (car, Qminus))
+            {
+              int first = 1;
+              double px;
+
+              pixels = 0;
+              while (CONSP (cdr))
+                {
+                  if (!calc_pixel_width_or_height (&px, it, XCAR (cdr),
+                                                   font, width_p, align_to))
+                    return 0;
+                  if (first)
+                    pixels = (EQ (car, Qplus) ? px : -px), first = 0;
+                  else
+                    pixels += px;
+                  cdr = XCDR (cdr);
+                }
+              if (EQ (car, Qminus))
+                pixels = -pixels;
+              return OK_PIXELS (pixels);
+            }
+
+          car = Fbuffer_local_value (car, it->w->buffer);
+        }
+
+      if (INTEGERP (car) || FLOATP (car))
+        {
+          double fact;
+          pixels = XFLOATINT (car);
+          if (NILP (cdr))
+            return OK_PIXELS (pixels);
+          if (calc_pixel_width_or_height (&fact, it, cdr,
+                                          font, width_p, align_to))
+            return OK_PIXELS (pixels * fact);
+          return 0;
+        }
+
+      return 0;
+    }
+
+  return 0;
+}
+
 
 /***********************************************************************
                              Glyph Display
@@ -17977,209 +18227,6 @@ append_stretch_glyph (it, object, width, height, ascent)
 }
 
 
-/* Calculate a width or height in pixels from a specification using
-   the following elements:
-
-   SPEC ::= 
-     NUM      - a (fractional) multiple of the default font width/height
-     (NUM)    - specifies exactly NUM pixels
-     UNIT     - a fixed number of pixels, see below.
-     ELEMENT  - size of a display element in pixels, see below.
-     (NUM . SPEC) - equals NUM * SPEC
-     (+ SPEC SPEC ...)  - add pixel values
-     (- SPEC SPEC ...)  - subtract pixel values
-     (- SPEC)           - negate pixel value
-
-   NUM ::= 
-     INT or FLOAT   - a number constant
-     SYMBOL         - use symbol's (buffer local) variable binding.
-
-   UNIT ::=
-     in       - pixels per inch  *)
-     mm       - pixels per 1/1000 meter  *)
-     cm       - pixels per 1/100 meter   *)
-     width    - width of current font in pixels.
-     height   - height of current font in pixels.
-
-     *) using the ratio(s) defined in display-pixels-per-inch.
-
-   ELEMENT ::=
-
-     left-fringe         - left fringe width in pixels
-     (left-fringe . nil) - left fringe width if inside margins, else 0
-     (left-fringe . t)   - left fringe width if outside margins, else 0
-
-     right-fringe         - right fringe width in pixels
-     (right-fringe . nil) - right fringe width if inside margins, else 0
-     (right-fringe . t)   - right fringe width if outside margins, else 0
-
-     left-margin          - left margin width in pixels
-     right-margin         - right margin width in pixels
-
-     scroll-bar           - scroll-bar area width in pixels
-     (scroll-bar . left)  - scroll-bar width if on left, else 0
-     (scroll-bar . right) - scroll-bar width if on right, else 0
-
-   Examples:
-
-   Pixels corresponding to 5 inches:
-     (5 . in)     
-                
-   Total width of non-text areas on left side of window:
-     (+ left-fringe left-margin (scroll-bar . left))
-
-   Total width of fringes if inside display margins:
-     (+ (left-fringe) (right-fringe))
-
-   Width of left margin minus width of 1 character in the default font:
-     (- left-margin 1)
-
-   Width of left margin minus width of 2 characters in the current font:
-     (- left-margin (2 . width))
-
-   Width of left fringe plus left margin minus one pixel:
-     (- (+ left-fringe left-margin) (1))
-     (+ left-fringe left-margin (- (1)))
-     (+ left-fringe left-margin (-1))
-
-*/
-
-#define NUMVAL(X)                               \
-     ((INTEGERP (X) || FLOATP (X))              \
-      ? XFLOATINT (X)                           \
-      : - 1)
-
-static int
-calc_pixel_width_or_height (res, it, prop, font, width_p)
-     double *res;
-     struct it *it;
-     Lisp_Object prop;
-     XFontStruct *font;
-     int width_p;
-{
-  double pixels;
-
-#define OK_PIXELS(val) ((*res = (val)), 1)
-
-  if (SYMBOLP (prop))
-    {
-      if (SCHARS (SYMBOL_NAME (prop)) == 2)
-        {
-          char *unit =  SDATA (SYMBOL_NAME (prop));
-
-          if (unit[0] == 'i' && unit[1] == 'n')
-            pixels = 1.0;
-          else if (unit[0] == 'm' && unit[1] == 'm')
-            pixels = 25.4;
-          else if (unit[0] == 'c' && unit[1] == 'm')
-            pixels = 2.54;
-          else
-            pixels = 0;
-          if (pixels > 0)
-            {
-              double ppi;
-              if ((ppi = NUMVAL (Vdisplay_pixels_per_inch), ppi > 0)
-                  || (CONSP (Vdisplay_pixels_per_inch)
-                      && (ppi = (width_p
-                                 ? NUMVAL (XCAR (Vdisplay_pixels_per_inch))
-                                 : NUMVAL (XCDR (Vdisplay_pixels_per_inch))),
-                          ppi > 0)))
-                return OK_PIXELS (ppi / pixels);
-
-              return 0;
-            }
-        }
-
-      if (EQ (prop, Qheight))
-        return OK_PIXELS (font ? FONT_HEIGHT (font) : FRAME_LINE_HEIGHT (it->f));
-      if (EQ (prop, Qwidth))
-        return OK_PIXELS (font ? FONT_WIDTH (font) : FRAME_COLUMN_WIDTH (it->f));
-      if (EQ (prop, Qleft_fringe))
-        return OK_PIXELS (WINDOW_LEFT_FRINGE_WIDTH (it->w));
-      if (EQ (prop, Qright_fringe))
-        return OK_PIXELS (WINDOW_RIGHT_FRINGE_WIDTH (it->w));
-      if (EQ (prop, Qleft_margin))
-        return OK_PIXELS (WINDOW_LEFT_MARGIN_WIDTH (it->w));
-      if (EQ (prop, Qright_margin))
-        return OK_PIXELS (WINDOW_RIGHT_MARGIN_WIDTH (it->w));
-      if (EQ (prop, Qscroll_bar))
-        return OK_PIXELS (WINDOW_SCROLL_BAR_AREA_WIDTH (it->w));
-
-      prop = Fbuffer_local_value (prop, it->w->buffer);
-    }
-
-  if (INTEGERP (prop) || FLOATP (prop))
-    {
-      int base_unit = (width_p
-                       ? FRAME_COLUMN_WIDTH (it->f)
-                       : FRAME_LINE_HEIGHT (it->f));
-      return OK_PIXELS (XFLOATINT (prop) * base_unit);
-    }
-
-  if (CONSP (prop))
-    {
-      Lisp_Object car = XCAR (prop);
-      Lisp_Object cdr = XCDR (prop);
-
-      if (SYMBOLP (car))
-        {
-          if (EQ (car, Qplus) || EQ (car, Qminus))
-            {
-              int first = 1;
-              double px;
-
-              pixels = 0;
-              while (CONSP (cdr))
-                {
-                  if (!calc_pixel_width_or_height (&px, it, XCAR (cdr), font, width_p))
-                    return 0;
-                  if (first)
-                    pixels = (EQ (car, Qplus) ? px : -px), first = 0;
-                  else
-                    pixels += px;
-                  cdr = XCDR (cdr);
-                }
-              if (EQ (car, Qminus))
-                pixels = -pixels;
-              return OK_PIXELS (pixels);
-            }
-
-          if (EQ (car, Qleft_fringe))
-            return OK_PIXELS ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (it->w)
-                               == !NILP (cdr))
-                              ? WINDOW_LEFT_FRINGE_WIDTH (it->w)
-                              : 0);
-          if (EQ (car, Qright_fringe))
-            return OK_PIXELS ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (it->w)
-                               == !NILP (cdr))
-                              ? WINDOW_RIGHT_FRINGE_WIDTH (it->w)
-                              : 0);
-          if (EQ (car, Qscroll_bar))
-            return OK_PIXELS ((WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (it->w)
-                                == EQ (cdr, Qleft))
-                               ? WINDOW_SCROLL_BAR_AREA_WIDTH (it->w)
-                               : 0);
-
-          car = Fbuffer_local_value (car, it->w->buffer);
-        }
-
-      if (INTEGERP (car) || FLOATP (car))
-        {
-          double fact;
-          pixels = XFLOATINT (car);
-          if (NILP (cdr))
-            return OK_PIXELS (pixels);
-          if (calc_pixel_width_or_height (&fact, it, cdr, font, width_p))
-            return OK_PIXELS (pixels * fact);
-          return 0;
-        }
-
-      return 0;
-    }
-
-  return 0;
-}
-
 /* Produce a stretch glyph for iterator IT.  IT->object is the value
    of the glyph property displayed.  The value must be a list
    `(space KEYWORD VALUE ...)' with the following KEYWORD/VALUE pairs
@@ -18217,7 +18264,7 @@ produce_stretch_glyph (it)
 {
   /* (space :width WIDTH :height HEIGHT ...)  */
   Lisp_Object prop, plist;
-  int width = 0, height = 0;
+  int width = 0, height = 0, align_to = -1;
   int zero_width_ok_p = 0, zero_height_ok_p = 0;
   int ascent = 0;
   double tem;
@@ -18232,7 +18279,7 @@ produce_stretch_glyph (it)
 
   /* Compute the width of the stretch.  */
   if ((prop = Fplist_get (plist, QCwidth), !NILP (prop))
-      && calc_pixel_width_or_height (&tem, it, prop, font, 1))
+      && calc_pixel_width_or_height (&tem, it, prop, font, 1, 0))
     {
       /* Absolute width `:width WIDTH' specified and valid.  */
       zero_width_ok_p = 1;
@@ -18263,9 +18310,15 @@ produce_stretch_glyph (it)
       width = NUMVAL (prop) * it2.pixel_width;
     }
   else if ((prop = Fplist_get (plist, QCalign_to), !NILP (prop))
-           && calc_pixel_width_or_height (&tem, it, prop, font, 1))
-    {
-      width = max (0, (int)tem - it->current_x);
+           && calc_pixel_width_or_height (&tem, it, prop, font, 1, &align_to))
+    {
+      if (it->glyph_row == NULL || !it->glyph_row->mode_line_p)
+        align_to = (align_to < 0 
+                    ? 0
+                    : align_to - window_box_left_offset (it->w, TEXT_AREA));
+      else if (align_to < 0)
+        align_to = window_box_left_offset (it->w, TEXT_AREA);
+      width = max (0, (int)tem + align_to - it->current_x);
       zero_width_ok_p = 1;
     }
   else
@@ -18277,7 +18330,7 @@ produce_stretch_glyph (it)
 
   /* Compute height.  */
   if ((prop = Fplist_get (plist, QCheight), !NILP (prop))
-      && calc_pixel_width_or_height (&tem, it, prop, font, 0))
+      && calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
     {
       height = (int)tem;
       zero_height_ok_p = 1;
@@ -18298,7 +18351,7 @@ produce_stretch_glyph (it)
       NUMVAL (prop) > 0 && NUMVAL (prop) <= 100)
     ascent = height * NUMVAL (prop) / 100.0;
   else if (!NILP (prop)
-           && calc_pixel_width_or_height (&tem, it, prop, font, 0))
+           && calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
     ascent = min (max (0, (int)tem), height);
   else
     ascent = (height * FONT_BASE (font)) / FONT_HEIGHT (font);
@@ -21522,6 +21575,8 @@ syms_of_xdisp ()
   staticpro (&Qleft_margin);
   Qright_margin = intern ("right-margin");
   staticpro (&Qright_margin);
+  Qcenter = intern ("center");
+  staticpro (&Qcenter);
   QCalign_to = intern (":align-to");
   staticpro (&QCalign_to);
   QCrelative_width = intern (":relative-width");
diff --git a/src/xterm.c b/src/xterm.c
index 86feb9ccf57..a297faa2ac0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6225,6 +6225,14 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           Lisp_Object coding_system = Qlatin_1;
           Lisp_Object c;
 
+#ifdef USE_GTK
+          /* Don't pass keys to GTK.  A Tab will shift focus to the
+             tool bar in GTK 2.4.  Keys will still go to menus and
+             dialogs because in that case popup_activated is TRUE
+             (see above).  */
+          *finish = X_EVENT_DROP;
+#endif
+
           event.xkey.state
             |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f),
                                        extra_keyboard_modifiers);