Merge from mainline.

4 files changed, 79 insertions, 30 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4837d8ecb06..a48194a90aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2010-02-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_clear_frame_area): Cal gtk_widget_queue_draw if USE_GTK,
+        bug #5571.
+
+2010-02-10  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xsmfns.c (x_session_initialize): Move initialization of ice_fd and
+        doing_interact here.
+        (ice_connection_closed): New function.
+        (x_session_check_input, smc_die_CB, ice_io_error_handler)
+        (ice_conn_watch_CB, x_session_close): Call ice_connection_closed.
+        (x_session_check_input): Call IceCloseConnection if IceProcessMessages
+        returns I/O error.
+        (ice_conn_watch_CB): Call add_keyboard_wait_descriptor on ice_fd,
+        bug #5512.
+
+2010-02-08  Francis Devereux  <francis@devrx.org>  (tiny change)
+
+        * nsfont.m (nsfont_open): The system's value for the font descent
+        is negative, so round it down to avoid clipping.
+
 2010-02-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * charset.c (load_charset_map_from_file)
@@ -78,7 +100,7 @@
 2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (Fx_create_frame): If frame height is too big, try
-        sizes 24 and 10. Bug #3643.
+        sizes 24 and 10.  Bug #3643.
 
 2010-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -165,7 +187,7 @@
         * xfns.c (x_get_current_desktop, x_get_desktop_workarea): New functions.
         (Fx_create_frame): Call x_get_current_desktop and x_get_desktop_workarea
         to find out usable size of the desktop.  Don't make frames larger than
-        this. Bug #3643.
+        this.  Bug #3643.
 
 2010-01-15  Kenichi Handa  <handa@m17n.org>
 
@@ -310,7 +332,7 @@
 
 2010-01-08  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS  (f) must
+        * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must
         also be true before we can return early (bug #5339).
 
 2010-01-06  David Reitter  <david.reitter@gmail.com>
@@ -342,7 +364,7 @@
 
         * xterm.c (x_new_font): Move code for setting rows/cols before
         resizing ...
-        (x_set_window_size): ... to here. bug #2568.
+        (x_set_window_size): ... to here.  Bug #2568.
 
         * gtkutil.c (xg_clear_under_internal_border): New function.
         (xg_frame_resized, xg_frame_set_char_size):
@@ -1581,7 +1603,7 @@
         Fix printf format.
         (ns_query_color): Use CGFloat where appropriate.
         (EmacsView<NSTextInput>, EmacsScroller): Fix method signatures.
-        (EmacsScroller-mouseDown:) Use long format in printf, and cast
+        (EmacsScroller-mouseDown:): Use long format in printf, and cast
         argument.
 
         * config.in (NS_HAVE_NSINTEGER): Drop.
@@ -4057,7 +4079,7 @@
 
 2009-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * keyboard.c (adjust_point_for_property): Allow stopping betwen two
+        * keyboard.c (adjust_point_for_property): Allow stopping between two
         invisible areas.
 
 2009-02-12  Jason Rumney  <jasonr@gnu.org>
diff --git a/src/nsfont.m b/src/nsfont.m
index d5107f376dd..97d74a82f2b 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -844,8 +844,10 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
     /* max bounds */
     font_info->max_bounds.ascent =
       lrint (hshrink * [sfont ascender] + expand * hd/2);
+    /* [sfont descender] is usually negative.  Use floor to avoid
+       clipping descenders. */
     font_info->max_bounds.descent =
-      -lrint (hshrink* [sfont descender] - expand*hd/2);
+      -lrint (floor(hshrink* [sfont descender] - expand*hd/2));
     font_info->height =
       font_info->max_bounds.ascent + font_info->max_bounds.descent;
     font_info->max_bounds.width = lrint (font_info->width);
@@ -880,8 +882,8 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
 #endif
 
     /* set up metrics portion of font struct */
-    font->ascent = [sfont ascender];
-    font->descent = -[sfont descender];
+    font->ascent = lrint([sfont ascender]);
+    font->descent = -lrint(floor([sfont descender]));
     font->min_width = ns_char_width(sfont, '|');
     font->space_width = lrint (ns_char_width (sfont, ' '));
     font->average_width = lrint (font_info->width);
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 55035816bfd..ec5ca3b1a9f 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -52,11 +52,11 @@ static struct input_event emacs_event;
 
 /* The descriptor that we use to check for data from the session manager.  */
 
-static int ice_fd = -1;
+static int ice_fd;
 
 /* A flag that says if we are in shutdown interactions or not.  */
 
-static int doing_interact = False;
+static int doing_interact;
 
 /* The session manager object for the session manager connection.  */
 
@@ -90,6 +90,14 @@ Lisp_Object Vx_session_previous_id;
 
 #define NOSPLASH_OPT "--no-splash"
 
+static void
+ice_connection_closed ()
+{
+  if (ice_fd >= 0)
+    delete_keyboard_wait_descriptor (ice_fd);
+  ice_fd = -1;
+}
+
 
 /* Handle any messages from the session manager.  If no connection is
    open to a session manager, just return 0.
@@ -101,9 +109,9 @@ x_session_check_input (bufp)
 {
   SELECT_TYPE read_fds;
   EMACS_TIME tmout;
+  int ret;
 
   if (ice_fd == -1) return 0;
-
   FD_ZERO (&read_fds);
   FD_SET (ice_fd, &read_fds);
 
@@ -116,26 +124,33 @@ x_session_check_input (bufp)
      will be called.  */
   emacs_event.kind = NO_EVENT;
 
-  if (select (ice_fd+1, &read_fds,
-              (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout) < 0)
+  ret = select (ice_fd+1, &read_fds,
+                (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout);
+
+  if (ret < 0)
     {
-      ice_fd = -1;
-      return 0;
+      ice_connection_closed ();
+    }
+  else if (ret > 0 && FD_ISSET (ice_fd, &read_fds))
+    {
+      ret = IceProcessMessages (SmcGetIceConnection (smc_conn),
+                                (IceReplyWaitInfo *)0, (Bool *)0);
+      if (ret != IceProcessMessagesSuccess)
+        {
+          /* Either IO error or Connection closed.  */
+          if (ret == IceProcessMessagesIOError)
+            IceCloseConnection (SmcGetIceConnection (smc_conn));
+
+          ice_connection_closed ();
+        }
     }
-
-
-  if (FD_ISSET (ice_fd, &read_fds))
-    IceProcessMessages (SmcGetIceConnection (smc_conn),
-                        (IceReplyWaitInfo *)0, (Bool *)0);
-
 
   /* Check if smc_interact_CB was called and we shall generate a
      SAVE_SESSION_EVENT.  */
-  if (emacs_event.kind == NO_EVENT)
-    return 0;
+  if (emacs_event.kind != NO_EVENT)
+    bcopy (&emacs_event, bufp, sizeof (struct input_event));
 
-  bcopy (&emacs_event, bufp, sizeof (struct input_event));
-  return 1;
+  return emacs_event.kind != NO_EVENT ? 1 : 0;
 }
 
 /* Return non-zero if we have a connection to a session manager.  */
@@ -284,7 +299,7 @@ smc_die_CB (smcConn, clientData)
      SmPointer clientData;
 {
   SmcCloseConnection (smcConn, 0, 0);
-  ice_fd = -1;
+  ice_connection_closed ();
 }
 
 /* We don't use the next two but they are mandatory, leave them empty.
@@ -356,7 +371,7 @@ ice_io_error_handler (iceConn)
      IceConn iceConn;
 {
   /* Connection probably gone.  */
-  ice_fd = -1;
+  ice_connection_closed ();
 }
 
 /* This is called when the ICE connection is created or closed.  The SM library
@@ -371,7 +386,7 @@ ice_conn_watch_CB (iceConn, clientData, opening, watchData)
 {
   if (! opening)
     {
-      ice_fd = -1;
+      ice_connection_closed ();
       return;
     }
 
@@ -384,6 +399,8 @@ ice_conn_watch_CB (iceConn, clientData, opening, watchData)
   if (interrupt_input)
     init_sigio (ice_fd);
 #endif /* ! defined (SIGIO) */
+
+  add_keyboard_wait_descriptor (ice_fd);
 }
 
 /* Create the client leader window.  */
@@ -426,6 +443,9 @@ x_session_initialize (dpyinfo)
   SmcCallbacks callbacks;
   int  name_len = 0;
 
+  ice_fd = -1;
+  doing_interact = False;
+
   /* Check if we where started by the session manager.  If so, we will
      have a previous id.  */
   if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
@@ -497,7 +517,7 @@ x_session_initialize (dpyinfo)
 void
 x_session_close ()
 {
-  ice_fd = -1;
+  ice_connection_closed ();
 }
 
 
diff --git a/src/xterm.c b/src/xterm.c
index 1add3c415e7..9ed98deb7b5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7446,6 +7446,11 @@ x_clear_frame_area (f, x, y, width, height)
 {
   x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                 x, y, width, height, False);
+#ifdef USE_GTK
+  /* Must queue a redraw, because scroll bars might have been cleared.  */
+  if (FRAME_GTK_WIDGET (f))
+    gtk_widget_queue_draw (FRAME_GTK_WIDGET (f));
+#endif
 }