comparison src/xfns.c @ 107779:41e0da544208

Set WM_CLIENT_MACHINE and _NET_WM_PID properties (Bug#5828). * xfns.c (set_machine_and_pid_properties): New function. (Fx_create_frame): Call set_machine_and_pid_properties.

107778:a91f626531f7

Lisp_Object Qfont_param;

/* In dispnew.c */

extern Lisp_Object Vwindow_system_version;

/* The below are defined in frame.c.  */

#if GLYPH_DEBUG
int image_cache_refcount, dpyinfo_refcount;

    x_wm_set_size_hint (f, 0, 0);
  UNBLOCK_INPUT;
  return Qnil;
}

DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
       1, 1, 0,
       doc: /* Make a new X window, which is called a "frame" in Emacs terms.
Return an Emacs frame object.
PARMS is an alist of frame parameters.

      else
	/* Must have been Qnil.  */
	;
    }

  /* Set the WM leader property.  GTK does this itself, so this is not
     needed when using GTK.  */
  if (dpyinfo->client_leader_window != 0)
    {
      BLOCK_INPUT;
      XChangeProperty (FRAME_X_DISPLAY (f),
                       FRAME_OUTER_WINDOW (f),
                       dpyinfo->Xatom_wm_client_leader,
                       XA_WINDOW, 32, PropModeReplace,
                       (unsigned char *) &dpyinfo->client_leader_window, 1);
      UNBLOCK_INPUT;
    }

  /* Initialize `default-minibuffer-frame' in case this is the first
     frame on this terminal.  */
  if (FRAME_HAS_MINIBUF_P (f)
      && (!FRAMEP (kb->Vdefault_minibuffer_frame)

107779:41e0da544208

Lisp_Object Qfont_param;

/* In dispnew.c */

extern Lisp_Object Vwindow_system_version;

/* In editfns.c */

extern Lisp_Object Vsystem_name;

/* The below are defined in frame.c.  */

#if GLYPH_DEBUG
int image_cache_refcount, dpyinfo_refcount;

    x_wm_set_size_hint (f, 0, 0);
  UNBLOCK_INPUT;
  return Qnil;
}

static void
set_machine_and_pid_properties (struct frame *f)
{
  /* See the above comment "Note: Encoding strategy".  */
  XTextProperty text;
  int bytes, stringp;
  int do_free_text_value = 0;

  text.value = x_encode_text (Vsystem_name,
                              Qcompound_text, 0, &bytes, &stringp,
                              &do_free_text_value);
  text.encoding = (stringp ? XA_STRING
                   : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
  text.format = 8;
  text.nitems = bytes;
  XSetWMClientMachine (FRAME_X_DISPLAY (f),
                       FRAME_OUTER_WINDOW (f),
                       &text);
  if (do_free_text_value)
    xfree (text.value);

  long pid = (long)getpid();
  XChangeProperty (FRAME_X_DISPLAY (f),
                   FRAME_OUTER_WINDOW (f),
                   XInternAtom (FRAME_X_DISPLAY (f),
                                "_NET_WM_PID",
                                False),
                   XA_CARDINAL, 32, PropModeReplace,
                   (unsigned char *) &pid, 1);
}

DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
       1, 1, 0,
       doc: /* Make a new X window, which is called a "frame" in Emacs terms.
Return an Emacs frame object.
PARMS is an alist of frame parameters.

      else
	/* Must have been Qnil.  */
	;
    }

  BLOCK_INPUT;
                       
  /* Set machine name and pid for the purpose of window managers.  */
  set_machine_and_pid_properties(f);

  /* Set the WM leader property.  GTK does this itself, so this is not
     needed when using GTK.  */
  if (dpyinfo->client_leader_window != 0)
    {
      XChangeProperty (FRAME_X_DISPLAY (f),
                       FRAME_OUTER_WINDOW (f),
                       dpyinfo->Xatom_wm_client_leader,
                       XA_WINDOW, 32, PropModeReplace,
                       (unsigned char *) &dpyinfo->client_leader_window, 1);
    }

  UNBLOCK_INPUT;

  /* Initialize `default-minibuffer-frame' in case this is the first
     frame on this terminal.  */
  if (FRAME_HAS_MINIBUF_P (f)
      && (!FRAMEP (kb->Vdefault_minibuffer_frame)