[Emacs-diffs] Changes to emacs/src/xterm.c

[Juanma Barranquero]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.769 emacs/src/xterm.c:1.770
*** emacs/src/xterm.c:1.769     Sat Jan 25 11:25:38 2003
--- emacs/src/xterm.c   Tue Feb  4 09:03:17 2003
***************
*** 8783,8794 ****
    gdouble position;
    gdouble *p;
    int diff;
!   
    int part = -1, whole = 0, portion = 0;
    GtkAdjustment *adj = GTK_ADJUSTMENT (widget);
!   
    if (xg_ignore_gtk_scrollbar) return;
!   
    position = gtk_adjustment_get_value (adj);
  
    p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
--- 8783,8794 ----
    gdouble position;
    gdouble *p;
    int diff;
! 
    int part = -1, whole = 0, portion = 0;
    GtkAdjustment *adj = GTK_ADJUSTMENT (widget);
! 
    if (xg_ignore_gtk_scrollbar) return;
! 
    position = gtk_adjustment_get_value (adj);
  
    p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
***************
*** 8803,8809 ****
    *p = position;
  
    diff = (int) (position - previous);
!   
    if (diff == (int) adj->step_increment)
      {
        part = scroll_bar_down_arrow;
--- 8803,8809 ----
    *p = position;
  
    diff = (int) (position - previous);
! 
    if (diff == (int) adj->step_increment)
      {
        part = scroll_bar_down_arrow;
***************
*** 8831,8837 ****
        portion = min (position, whole);
        bar->dragging = make_number (portion);
      }
!   
    if (part >= 0)
      {
        xg_ignore_next_thumb = 1;
--- 8831,8837 ----
        portion = min (position, whole);
        bar->dragging = make_number (portion);
      }
! 
    if (part >= 0)
      {
        xg_ignore_next_thumb = 1;
***************
*** 10221,10227 ****
     Returns non-zero if the event was filtered, caller shall not process
     this event further.
     Returns zero if event is wasn't filtered.  */
!    
  #ifdef HAVE_X_I18N
  static int
  x_filter_event (dpyinfo, event)
--- 10221,10227 ----
     Returns non-zero if the event was filtered, caller shall not process
     this event further.
     Returns zero if event is wasn't filtered.  */
! 
  #ifdef HAVE_X_I18N
  static int
  x_filter_event (dpyinfo, event)
***************
*** 10286,10292 ****
  
  
  /* Handles the XEvent EVENT on display DPYINFO.
!    
     *FINISH is X_EVENT_GOTO_OUT if caller should stop reading events.
     *FINISH is zero if caller should continue reading events.
     *FINISH is X_EVENT_DROP if event should not be passed to the toolkit.
--- 10286,10292 ----
  
  
  /* Handles the XEvent EVENT on display DPYINFO.
! 
     *FINISH is X_EVENT_GOTO_OUT if caller should stop reading events.
     *FINISH is zero if caller should continue reading events.
     *FINISH is X_EVENT_DROP if event should not be passed to the toolkit.
***************
*** 10294,10300 ****
     Events representing keys are stored in buffer *BUFP_R,
     which can hold up to *NUMCHARSP characters.
     We return the number of characters stored into the buffer. */
!    
  static int
  handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish)
       struct x_display_info *dpyinfo;
--- 10294,10300 ----
     Events representing keys are stored in buffer *BUFP_R,
     which can hold up to *NUMCHARSP characters.
     We return the number of characters stored into the buffer. */
! 
  static int
  handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish)
       struct x_display_info *dpyinfo;
***************
*** 10312,10318 ****
    XEvent event = *eventp;
  
    *finish = X_EVENT_NORMAL;
!   
    switch (event.type)
      {
      case ClientMessage:
--- 10312,10318 ----
    XEvent event = *eventp;
  
    *finish = X_EVENT_NORMAL;
! 
    switch (event.type)
      {
      case ClientMessage:
***************
*** 11541,11547 ****
      }
  
    goto ret;
!   
   out:
    *finish = X_EVENT_GOTO_OUT;
  
--- 11541,11547 ----
      }
  
    goto ret;
! 
   out:
    *finish = X_EVENT_GOTO_OUT;
  
***************
*** 11549,11555 ****
    *bufp_r = bufp;
    *numcharsp = numchars;
    *eventp = event;
!   
    return count;
  }
  
--- 11549,11555 ----
    *bufp_r = bufp;
    *numcharsp = numchars;
    *eventp = event;
! 
    return count;
  }
  
***************
*** 11569,11579 ****
    struct input_event *bufpp = bufp;
    int numchars = 10;
    int finish = X_EVENT_NORMAL;
!       
    for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
      if (dpyinfo->display == display)
        break;
!           
    if (dpyinfo)
      {
        int i, events;
--- 11569,11579 ----
    struct input_event *bufpp = bufp;
    int numchars = 10;
    int finish = X_EVENT_NORMAL;
! 
    for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
      if (dpyinfo->display == display)
        break;
! 
    if (dpyinfo)
      {
        int i, events;
***************
*** 11681,11687 ****
           We use a bunch of globals to communicate with our filter function,
           that is kind of ugly, but it works. */
        current_dpyinfo = dpyinfo;
!       
        while (gtk_events_pending ())
          {
            static int nr = 0;
--- 11681,11687 ----
           We use a bunch of globals to communicate with our filter function,
           that is kind of ugly, but it works. */
        current_dpyinfo = dpyinfo;
! 
        while (gtk_events_pending ())
          {
            static int nr = 0;
***************
*** 11703,11709 ****
        while (XPending (dpyinfo->display))
        {
            int finish;
!           
          XNextEvent (dpyinfo->display, &event);
  
  #ifdef HAVE_X_I18N
--- 11703,11709 ----
        while (XPending (dpyinfo->display))
        {
            int finish;
! 
          XNextEvent (dpyinfo->display, &event);
  
  #ifdef HAVE_X_I18N
***************
*** 14105,14111 ****
            FRAME_GTK_OUTER_WIDGET (f) = 0;
          }
  #endif /* USE_GTK */
!           
        if (FRAME_X_WINDOW (f))
        XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
  #endif /* !USE_X_TOOLKIT */
--- 14105,14111 ----
            FRAME_GTK_OUTER_WIDGET (f) = 0;
          }
  #endif /* USE_GTK */
! 
        if (FRAME_X_WINDOW (f))
        XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
  #endif /* !USE_X_TOOLKIT */
***************
*** 14208,14214 ****
    int ac = 0;
    Dimension widget_width, widget_height;
  #endif
!   
    Window window = FRAME_OUTER_WINDOW (f);
  
    /* Setting PMaxSize caused various problems.  */
--- 14208,14214 ----
    int ac = 0;
    Dimension widget_width, widget_height;
  #endif
! 
    Window window = FRAME_OUTER_WINDOW (f);
  
    /* Setting PMaxSize caused various problems.  */
***************
*** 15198,15204 ****
  
      argv[argc++] = "--name";
      argv[argc++] = resource_name;
!     
  #ifdef HAVE_X11R5
      XSetLocaleModifiers ("");
  #endif
--- 15198,15204 ----
  
      argv[argc++] = "--name";
      argv[argc++] = resource_name;
! 
  #ifdef HAVE_X11R5
      XSetLocaleModifiers ("");
  #endif
***************
*** 15210,15216 ****
      xg_initialize ();
  
      dpy = GDK_DISPLAY ();
!     
      /* NULL window -> events for all windows go to our function */
      gdk_window_add_filter (NULL, event_handler_gdk, NULL);
  
--- 15210,15216 ----
      xg_initialize ();
  
      dpy = GDK_DISPLAY ();
! 
      /* NULL window -> events for all windows go to our function */
      gdk_window_add_filter (NULL, event_handler_gdk, NULL);
  
***************
*** 15226,15235 ****
  
        if (! NILP (abs_file) && Ffile_readable_p (abs_file))
          gtk_rc_parse (SDATA (abs_file));
!       
        UNGCPRO;
      }
!     
      XSetErrorHandler (x_error_handler);
      XSetIOErrorHandler (x_io_error_quitter);
    }
--- 15226,15235 ----
  
        if (! NILP (abs_file) && Ffile_readable_p (abs_file))
          gtk_rc_parse (SDATA (abs_file));
! 
        UNGCPRO;
      }
! 
      XSetErrorHandler (x_error_handler);
      XSetIOErrorHandler (x_io_error_quitter);
    }