comparison src/xterm.c @ 49600:23a1cea22d13

Trailing whitespace deleted.

49599:5ade352e8d1c

  struct scroll_bar *bar = (struct scroll_bar *) data;
  gdouble previous;
  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);
  if (! p)
    {

  previous = *p;
  *p = position;

  diff = (int) (position - previous);
  
  if (diff == (int) adj->step_increment)
    {
      part = scroll_bar_down_arrow;
      bar->dragging = Qnil;
    }

      part = scroll_bar_handle;
      whole = adj->upper - adj->page_size;
      portion = min (position, whole);
      bar->dragging = make_number (portion);
    }
  
  if (part >= 0)
    {
      xg_ignore_next_thumb = 1;
      window_being_scrolled = bar->window;
      last_scroll_bar_part = part;

   EVENT is the X event to filter.

   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)
     struct x_display_info *dpyinfo;
     XEvent *event;

}
#endif /* USE_GTK */


/* 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.

   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;
     XEvent *eventp;
     /* register */ struct input_event **bufp_r;

  struct input_event *bufp = *bufp_r;
  int numchars = *numcharsp;
  XEvent event = *eventp;

  *finish = X_EVENT_NORMAL;
  
  switch (event.type)
    {
    case ClientMessage:
      {
        if (event.xclient.message_type

#endif /* USE_X_TOOLKIT */
    break;
    }

  goto ret;
  
 out:
  *finish = X_EVENT_GOTO_OUT;

 ret:
  *bufp_r = bufp;
  *numcharsp = numchars;
  *eventp = event;
  
  return count;
}


/* Handles the XEvent EVENT on display DISPLAY.

  struct x_display_info *dpyinfo;
  struct input_event bufp[10];
  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;
      events = handle_one_xevent (dpyinfo,
                                  event,

      /* For GTK we must use the GTK event loop.  But XEvents gets passed
         to our filter function above, and then to the big event switch.
         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;
          current_count = count;
          current_numcharsp = &numchars;

#else /* not USE_GTK */
      while (XPending (dpyinfo->display))
	{
          int finish;
          
	  XNextEvent (dpyinfo->display, &event);

#ifdef HAVE_X_I18N
          /* Filter events for the current X input method.  */
          if (x_filter_event (dpyinfo, &event))

          gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f));
          FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow below */
          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 */

      unload_color (f, f->output_data.x->foreground_pixel);

#ifdef USE_X_TOOLKIT
  Arg al[2];
  int ac = 0;
  Dimension widget_width, widget_height;
#endif
  
  Window window = FRAME_OUTER_WINDOW (f);

  /* Setting PMaxSize caused various problems.  */
  size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;

        argv[argc++] = SDATA (display_name);
      }

    argv[argc++] = "--name";
    argv[argc++] = resource_name;
    
#ifdef HAVE_X11R5
    XSetLocaleModifiers ("");
#endif

    gtk_init (&argc, &argv2);

    /* gtk_init does set_locale.  We must fix locale after calling it.  */
    fixup_locale ();
    xg_initialize ();

    dpy = GDK_DISPLAY ();
    
    /* NULL window -> events for all windows go to our function */
    gdk_window_add_filter (NULL, event_handler_gdk, NULL);

    /* Load our own gtkrc if it exists.  */
    {

      s = make_string (file, strlen (file));
      abs_file = Fexpand_file_name(s, Qnil);

      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);
  }
#else /* not USE_GTK */
#ifdef USE_X_TOOLKIT

49600:23a1cea22d13

  struct scroll_bar *bar = (struct scroll_bar *) data;
  gdouble previous;
  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);
  if (! p)
    {

  previous = *p;
  *p = position;

  diff = (int) (position - previous);

  if (diff == (int) adj->step_increment)
    {
      part = scroll_bar_down_arrow;
      bar->dragging = Qnil;
    }

      part = scroll_bar_handle;
      whole = adj->upper - adj->page_size;
      portion = min (position, whole);
      bar->dragging = make_number (portion);
    }

  if (part >= 0)
    {
      xg_ignore_next_thumb = 1;
      window_being_scrolled = bar->window;
      last_scroll_bar_part = part;

   EVENT is the X event to filter.

   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)
     struct x_display_info *dpyinfo;
     XEvent *event;

}
#endif /* USE_GTK */


/* 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.

   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;
     XEvent *eventp;
     /* register */ struct input_event **bufp_r;

  struct input_event *bufp = *bufp_r;
  int numchars = *numcharsp;
  XEvent event = *eventp;

  *finish = X_EVENT_NORMAL;

  switch (event.type)
    {
    case ClientMessage:
      {
        if (event.xclient.message_type

#endif /* USE_X_TOOLKIT */
    break;
    }

  goto ret;

 out:
  *finish = X_EVENT_GOTO_OUT;

 ret:
  *bufp_r = bufp;
  *numcharsp = numchars;
  *eventp = event;

  return count;
}


/* Handles the XEvent EVENT on display DISPLAY.

  struct x_display_info *dpyinfo;
  struct input_event bufp[10];
  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;
      events = handle_one_xevent (dpyinfo,
                                  event,

      /* For GTK we must use the GTK event loop.  But XEvents gets passed
         to our filter function above, and then to the big event switch.
         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;
          current_count = count;
          current_numcharsp = &numchars;

#else /* not USE_GTK */
      while (XPending (dpyinfo->display))
	{
          int finish;

	  XNextEvent (dpyinfo->display, &event);

#ifdef HAVE_X_I18N
          /* Filter events for the current X input method.  */
          if (x_filter_event (dpyinfo, &event))

          gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f));
          FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow below */
          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 */

      unload_color (f, f->output_data.x->foreground_pixel);

#ifdef USE_X_TOOLKIT
  Arg al[2];
  int ac = 0;
  Dimension widget_width, widget_height;
#endif

  Window window = FRAME_OUTER_WINDOW (f);

  /* Setting PMaxSize caused various problems.  */
  size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;

        argv[argc++] = SDATA (display_name);
      }

    argv[argc++] = "--name";
    argv[argc++] = resource_name;

#ifdef HAVE_X11R5
    XSetLocaleModifiers ("");
#endif

    gtk_init (&argc, &argv2);

    /* gtk_init does set_locale.  We must fix locale after calling it.  */
    fixup_locale ();
    xg_initialize ();

    dpy = GDK_DISPLAY ();

    /* NULL window -> events for all windows go to our function */
    gdk_window_add_filter (NULL, event_handler_gdk, NULL);

    /* Load our own gtkrc if it exists.  */
    {

      s = make_string (file, strlen (file));
      abs_file = Fexpand_file_name(s, Qnil);

      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);
  }
#else /* not USE_GTK */
#ifdef USE_X_TOOLKIT