From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Julien Danjou Newsgroups: gmane.emacs.devel Subject: [PATCH 5/6] xsmfns: use pre-fetch SM_CLIENT_ID Date: Wed, 10 Nov 2010 14:49:55 +0100 Message-ID: <1289396996-26774-6-git-send-email-julien@danjou.info> References: <1289396996-26774-1-git-send-email-julien@danjou.info> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1289397032 31337 80.91.229.12 (10 Nov 2010 13:50:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 13:50:32 +0000 (UTC) Cc: Julien Danjou To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 14:50:19 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PGB47-00017w-9b for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 14:50:19 +0100 Original-Received: from localhost ([127.0.0.1]:58469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGB46-0008Rd-K2 for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 08:50:18 -0500 Original-Received: from [140.186.70.92] (port=48380 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGB3s-0008Ko-OA for emacs-devel@gnu.org; Wed, 10 Nov 2010 08:50:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGB3q-0004qi-Kd for emacs-devel@gnu.org; Wed, 10 Nov 2010 08:50:04 -0500 Original-Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:38375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGB3q-0004oV-Dg for emacs-devel@gnu.org; Wed, 10 Nov 2010 08:50:02 -0500 Original-Received: from cigue.easter-eggs.fr (cigue.easter-eggs.fr [10.0.0.33]) by rose.easter-eggs.fr (Postfix) with ESMTPS id 541BD14295; Wed, 10 Nov 2010 14:49:58 +0100 (CET) Original-Received: from jdanjou by cigue.easter-eggs.fr with local (Exim 4.72) (envelope-from ) id 1PGB3o-00071y-Uo; Wed, 10 Nov 2010 14:50:00 +0100 X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1289396996-26774-1-git-send-email-julien@danjou.info> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132505 Archived-At: Signed-off-by: Julien Danjou --- src/ChangeLog | 5 +++++ src/xsmfns.c | 4 ++-- src/xterm.c | 3 ++- src/xterm.h | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 13bb320..3975d8b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2010-11-10 Julien Danjou + * xterm.h (x_display_info): Add SM_CLIENT_ID atom. + + * xsmfns.c (create_client_leader_window): Use SM_CLIENT_ID atom + from dpyinfo. + * xterm.c (set_wm_state): Use x_send_client_event rather than Fx_send_client_event, using Atom directly. (x_ewmh_activate_frame): Ditto. diff --git a/src/xsmfns.c b/src/xsmfns.c index 79dccfa..7b82fd4 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -410,8 +410,8 @@ create_client_leader_window (struct x_display_info *dpyinfo, char *client_id) XSetClassHint (dpyinfo->display, w, &class_hints); XStoreName (dpyinfo->display, w, class_hints.res_name); - sm_id = XInternAtom (dpyinfo->display, "SM_CLIENT_ID", False); - XChangeProperty (dpyinfo->display, w, sm_id, XA_STRING, 8, PropModeReplace, + XChangeProperty (dpyinfo->display, w, dpyinfo->Xatom_SM_CLIENT_ID, + XA_STRING, 8, PropModeReplace, (unsigned char *)client_id, strlen (client_id)); dpyinfo->client_leader_window = w; diff --git a/src/xterm.c b/src/xterm.c index 36cbb12..e8a7d07 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10248,7 +10248,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) "_NET_SUPPORTED", &dpyinfo->Xatom_net_supported, "_NET_SUPPORTING_WM_CHECK", &dpyinfo->Xatom_net_supported, "_NET_WM_WINDOW_OPACITY", &dpyinfo->Xatom_net_wm_window_opacity, - "_NET_ACTIVE_WINDOW", &dpyinfo->Xatom_net_active_window + "_NET_ACTIVE_WINDOW", &dpyinfo->Xatom_net_active_window, + "SM_CLIENT_ID", &dpyinfo->Xatom_SM_CLIENT_ID }; int i; diff --git a/src/xterm.h b/src/xterm.h index d9ed120..ed873e6 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -352,6 +352,9 @@ struct x_display_info Atom Xatom_net_wm_name, Xatom_net_wm_icon_name; /* Frame opacity */ Atom Xatom_net_wm_window_opacity; + + /* SM */ + Atom Xatom_SM_CLIENT_ID; }; #ifdef HAVE_X_I18N -- 1.7.2.3