From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Alex Newsgroups: gmane.emacs.devel Subject: Re: Renaming non-X x_* procedures in xdisp.c (and elsewhere) Date: Sat, 23 Mar 2019 22:50:45 -0600 Message-ID: <871s2w510a.fsf@gmail.com> References: <87wokp4okn.fsf@gmail.com> <83ef6xpo6b.fsf@gnu.org> <0f4be9a6-6e09-f55d-9f58-2a15aef264cd@cs.ucla.edu> <837ecpplw8.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="39794"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Cc: Paul Eggert , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 24 05:50:57 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1h7v60-000AF4-Jj for ged-emacs-devel@m.gmane.org; Sun, 24 Mar 2019 05:50:56 +0100 Original-Received: from localhost ([127.0.0.1]:51844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7v5z-0006nY-KC for ged-emacs-devel@m.gmane.org; Sun, 24 Mar 2019 00:50:55 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:42918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7v5t-0006nP-JQ for emacs-devel@gnu.org; Sun, 24 Mar 2019 00:50:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7v5s-0006Ln-JN for emacs-devel@gnu.org; Sun, 24 Mar 2019 00:50:49 -0400 Original-Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:46515) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7v5s-0006Kf-9c; Sun, 24 Mar 2019 00:50:48 -0400 Original-Received: by mail-pf1-x42f.google.com with SMTP id 9so4113098pfj.13; Sat, 23 Mar 2019 21:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=rzkkTQRUnfMWi0DADnr8rFaL/thWG0EcMinUg/Xi4sQ=; b=PHBy/9pcoFlgoMy8A8wb5ul5dqAASYB3UPJalDBMgM+w0oMs+OvVEIihMNVREl3koW 1OWYM8LH+p7hL3pzOU51BQ/4P9MK+p6IUYUwtiYfVK/AEZM2wOYPcFmu8odw0HkYNWC0 grFWBfDQk8ce74se8nnUZc51VN76V+caecQbBWHU+n+Lbfbgg26rm7tRm9etj/GJ0mjV 3u1bD3r/5EB6nSrmTweUUnB6ctPy/zRIR3eA0QKaKHpPnRPX3hH/b/m5idYfBFHKq1nN kXfH4qRLM6meBnwfmcNEGbrJ7MwuBfM5n7fjb912m10nU+6wSjAIC/eNytz/0t7RM9cP 32MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=rzkkTQRUnfMWi0DADnr8rFaL/thWG0EcMinUg/Xi4sQ=; b=RVwF4LlT7Q9h1XB7vc+L7XOEynfmqzwMT5iGc+6MOGmT83E+lxkiskXRlHy0xdGgRH 2s91/QyOBWdZGIlPWPUCTKpSzSrAqsqQ5Wyya7h/6Ch7er+9Ua1eeDUYaY6msrJZtb+v rAsSGGXiBfBcXOTJrKCQhevu7aziICCO2wysNj81KwZtCozjxTSLsfiOpgo4Ob5oJ+d3 SNO5q+4jvbvJ3LZ23HhXCvHI4IB7HrWzqua/Ibc09Cg4R2jWrWV//4wGRdmkaL1p3ZAc Ute+/xSB4P+ZrXQcqpoVdSnOvfJCYLnkqgBMtec4VfS4pyXuIFzMg6s1q5K5STMSLiNr Bn6w== X-Gm-Message-State: APjAAAX+H2IkpOya7ZUvL0VafO7Sa+cnCFSuuubIXiUhggKpbEbbmg06 t2223USf7SRXCnNvWAkalYOjMKjE X-Google-Smtp-Source: APXvYqwZAOYst7g6BnY5RaqWJA805fgvJa4ORbcu4uvMDKO6yy6fETo35HRssFkQ0TfrsAM5lrn7ZA== X-Received: by 2002:a62:4414:: with SMTP id r20mr17486128pfa.37.1553403046336; Sat, 23 Mar 2019 21:50:46 -0700 (PDT) Original-Received: from lylat ([2604:3d09:e380:2255:962f:b96:2aaf:c3d5]) by smtp.gmail.com with ESMTPSA id i126sm17741432pfc.101.2019.03.23.21.50.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 21:50:45 -0700 (PDT) In-Reply-To: <837ecpplw8.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 23 Mar 2019 18:59:19 +0200") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:234674 Archived-At: Eli Zaretskii writes: > I don't have strong opinions about this. Aside of making the > archeology and forensics harder, renaming will get in the way of my > personal acquaintance with the code in xdisp.c and dispnew.c, but that > alone doesn't sound like a reason to object to the change. It will > probably also require a lot more ugly #ifdef's in the mainline code > (or calling through function pointers, not sure which is worse), and > quite a few changes in the headers to go with that. How about using something like the following? It's ugly, but at least it doesn't ruin the rest of the code. #ifdef HAVE_X_WINDOWS #define CASE_X(proc, ...) \ case output_x_window: \ x_ ## proc (__VAR_ARGS__) #define CASE_X_VAR(var, proc, ...) \ case output_x_window: \ var = x_ ## proc (__VA_ARGS__) #else #define CASE_X(...) #define CASE_X_VAR(...) #endif #ifdef HAVE_NTGUI #define CASE_W32(proc, ...) \ case output_w32: \ w32_ ## proc (__VA_ARGS__) #define CASE_W32_VAR(var, proc, ...) \ case output_w32: \ var = w32_ ## proc (__VA_ARGS__) #else #define CASE_W32(...) #define CASE_W32_VAR(...) #endif #ifdef HAVE_NS #define CASE_NS(proc, ...) \ case output_ns: \ ns_ ## proc (__VA_ARGS__) #define CASE_NS_VAR(var, proc, ...) \ case output_ns: \ var = ns_ ## proc (__VA_ARGS__) #else #define CASE_NS(...) #define CASE_NS_VAR(...) #endif #define CALL_FOR_WS(f, proc, ...) \ switch ((f)->output_method) \ { \ CASE_X (proc, __VA_ARGS__); \ CASE_W32 (proc, __VA_ARGS__); \ CASE_NS (proc, __VA_ARGS__); \ } #define ASSIGN_FOR_WS(f, var, proc, ...) \ switch ((f)->output_method) \ { \ CASE_X_VAR (var, proc, __VA_ARGS__); \ CASE_W32_VAR (var, proc, __VA_ARGS__); \ CASE_NS_VAR (var, proc, __VA_ARGS__); \ }