comparison src/xterm.c @ 11015:3a2547424010

(get_perdisplay): Deleted. (same_x_server): New function. (x_term_init): If this display shares a keyboard with one we've already opened, then share the structure. (x_delete_display): Don't delete the kboard until the reference count becomes zero.

11014:634a98104921

    if (dpyinfo->display == dpy)
      return dpyinfo;

  return 0;
}

#ifdef MULTI_PERDISPLAY
/* Return the perdisplay struct corresponding to FRAME.  */
#undef get_perdisplay

PERDISPLAY *
get_perdisplay(frame)
     FRAME_PTR frame;
{
  return get_perdisplay_macro (frame);
}
#define get_perdisplay(frame) get_perdisplay_macro (frame)
#endif

/* Starting and ending updates.

   These hooks are called by update_frame at the beginning and end
   of a frame update.  We record in `updating_frame' the identity

};
#endif /* USE_X_TOOLKIT */

static int x_initialized;

struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
     Lisp_Object display_name;
     char *xrm_option;
     char *resource_name;

  /* We have definitely succeeded.  Record the new connection.  */

  dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info));

#ifdef MULTI_PERDISPLAY
  init_perdisplay (&dpyinfo->perdisplay);
  dpyinfo->perdisplay.next_perdisplay = all_perdisplays;
  all_perdisplays = &dpyinfo->perdisplay;
#endif

  /* Put this display on the chain.  */
  dpyinfo->next = x_display_list;
  x_display_list = dpyinfo;

#ifndef USE_X_TOOLKIT
  /* I'm told Xt does this itself.  */
  XrmDestroyDatabase (dpyinfo->xrdb);
#endif
#ifdef MULTI_PERDISPLAY
  {
    PERDISPLAY **perdp;
    for (perdp = &all_perdisplays; *perdp != &dpyinfo->perdisplay;
	 perdp = &(*perdp)->next_perdisplay)
      if (*perdp == NULL)
	abort ();
    *perdp = dpyinfo->perdisplay.next_perdisplay;
  }
  wipe_perdisplay (&dpyinfo->perdisplay);
#endif
  xfree (dpyinfo->font_table);
  xfree (dpyinfo->x_id_name);
  xfree (dpyinfo);
}

11015:3a2547424010

    if (dpyinfo->display == dpy)
      return dpyinfo;

  return 0;
}

/* Starting and ending updates.

   These hooks are called by update_frame at the beginning and end
   of a frame update.  We record in `updating_frame' the identity

};
#endif /* USE_X_TOOLKIT */

static int x_initialized;

#ifdef MULTI_KBOARD
/* Test whether two display-name strings agree up to the dot that separates
   the screen number from the server number.  */
static int
same_x_server (name1, name2)
     char *name1, *name2;
{
  int seen_colon = 0;
  for (; *name1 != '\0' && *name1 == *name2; name1++, name2++)
    {
      if (*name1 == ':')
	seen_colon++;
      if (seen_colon && *name1 == '.')
	return 1;
    }
  return (seen_colon
	  && (*name1 == '.' || *name1 == '\0')
	  && (*name2 == '.' || *name2 == '\0'));
}
#endif

struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
     Lisp_Object display_name;
     char *xrm_option;
     char *resource_name;

  /* We have definitely succeeded.  Record the new connection.  */

  dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info));

#ifdef MULTI_KBOARD
  {
    struct x_display_info *share;
    Lisp_Object tail;

    for (share = x_display_list, tail = x_display_name_list; share;
	 share = share->next, tail = XCONS (tail)->cdr)
      if (same_x_server (XSTRING (XCONS (XCONS (tail)->car)->car)->data,
			 XSTRING (display_name)->data))
	break;
    if (share)
      dpyinfo->kboard = share->kboard;
    else
      {
	dpyinfo->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
	init_kboard (dpyinfo->kboard);
	dpyinfo->kboard->next_kboard = all_kboards;
	all_kboards = dpyinfo->kboard;
      }
    dpyinfo->kboard->reference_count++;
  }
#endif

  /* Put this display on the chain.  */
  dpyinfo->next = x_display_list;
  x_display_list = dpyinfo;

#ifndef USE_X_TOOLKIT
  /* I'm told Xt does this itself.  */
  XrmDestroyDatabase (dpyinfo->xrdb);
#endif
#ifdef MULTI_KBOARD
  if (--dpyinfo->kboard->reference_count == 0)
    {
      KBOARD **kbp;
      for (kbp = &all_kboards; *kbp != dpyinfo->kboard;
	   kbp = &(*kbp)->next_kboard)
	if (*kbp == NULL)
	  abort ();
      *kbp = dpyinfo->kboard->next_kboard;
      wipe_kboard (dpyinfo->kboard);
      xfree (dpyinfo->kboard);
    }
#endif
  xfree (dpyinfo->font_table);
  xfree (dpyinfo->x_id_name);
  xfree (dpyinfo);
}