From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Third Newsgroups: gmane.emacs.bugs Subject: bug#22973: [PATCH] Enable dividers in NS (bug#22973) Date: Wed, 4 May 2016 22:42:04 +0100 Message-ID: <20160504214204.GA39118@breton.holly.idiocy.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1462398223 15400 80.91.229.3 (4 May 2016 21:43:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 May 2016 21:43:43 +0000 (UTC) To: 22973@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 04 23:43:35 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ay4Zv-0003ax-HN for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 May 2016 23:43:31 +0200 Original-Received: from localhost ([::1]:50474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay4Zr-0006ti-Nl for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 May 2016 17:43:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay4Zi-0006dm-RW for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 17:43:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ay4ZX-0001c1-3j for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 17:43:13 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay4ZV-0001Z1-TY for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 17:43:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ay4ZS-0000J8-Hm for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 17:43:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 May 2016 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22973 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22973-submit@debbugs.gnu.org id=B22973.14623981341123 (code B ref 22973); Wed, 04 May 2016 21:43:02 +0000 Original-Received: (at 22973) by debbugs.gnu.org; 4 May 2016 21:42:14 +0000 Original-Received: from localhost ([127.0.0.1]:38395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay4Yg-0000I2-HS for submit@debbugs.gnu.org; Wed, 04 May 2016 17:42:14 -0400 Original-Received: from mail-wm0-f68.google.com ([74.125.82.68]:35563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay4Yf-0000Hp-8F for 22973@debbugs.gnu.org; Wed, 04 May 2016 17:42:13 -0400 Original-Received: by mail-wm0-f68.google.com with SMTP id e201so13216180wme.2 for <22973@debbugs.gnu.org>; Wed, 04 May 2016 14:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=lBNcXLYpWq/kHrUYxgW0CdHGo869/FrEWpSBiE5asAw=; b=NJ/e51Mcv7jHOX/qhAC1j+9v43zEQmwlBxO2NCFh6N1cHpEDu1g15K6RZMa1B7vyOC uJ4igK1E2GSmMdScylkUqgLC9j3xq1oHs7+BD6HF88OC80GmAGIhp1z9LrCNI6g2aga5 hNDGqe/MKcu1wKnhaCQ5O955MFdqO3uytqpDXhStnR3VDJ7SDNIn7++MsyG2/TK73rJc lfsGoXorn+9yhoQqo/SLfoSEKf+qSuUXXFYvJ7UalRJ1oYnu30jdecv5c/6x2WGzY4A7 yGvLQzumvF74dEEbH4E4NIGXkSU5MN6YDLjSUa0LhME3rHVXVYXoIfa5ZIJvXjYS2Yz2 q2IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:subject:message-id :mime-version:content-disposition:user-agent; bh=lBNcXLYpWq/kHrUYxgW0CdHGo869/FrEWpSBiE5asAw=; b=ZMa2SUhTgctwYfWEjeSB5LtNOHvsLKQKli+QC5J4/AR2ZGVTAL3HpaicSoEZBrbkVS VL9AeYz/AtMvkPs6o3W5aoNkGehd5sr/41eUz5ixy2ahWU8s4TZPd0Og4thTUOUaWBiH lJE/akAF8+VaMtFcp39HybsBl+DPw4FLT+6NQuQF0h3Rs6wdFsKs7rZTqwzUyn4wyzeC QPxNzaxipsm8k3JdUuvph3VWvN6aceJaONQZ/V25mW3NPdzcnXnwnduxKxw1Bx8p5Ang tfFJ+jy8vCwW8bP4UXxbNfgjYkk5Lxbox4VSKJw98el/eRfsUvKt4Sw9vZM7z5dQqGkS hTcg== X-Gm-Message-State: AOPr4FV7+R5nd4nh63NvSz1nIwU+W8RDUPMRzCq7KlQUrCZsF37xmQs2Wz9ot57oEImpiw== X-Received: by 10.194.108.197 with SMTP id hm5mr10753500wjb.167.1462398127075; Wed, 04 May 2016 14:42:07 -0700 (PDT) Original-Received: from breton.holly.idiocy.org (ip6-2001-08b0-03f8-8129-21d2-271e-c744-30ec.holly.idiocy.org. [2001:8b0:3f8:8129:21d2:271e:c744:30ec]) by smtp.gmail.com with ESMTPSA id gg7sm6383110wjd.10.2016.05.04.14.42.06 for <22973@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 14:42:06 -0700 (PDT) Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:117808 Archived-At: src/nsfns.m: Add colour settings functions to ns_frame_park_handlers. src/nsterm.m (ns_draw_window_divider): ns_focus has to go before the attempt to set the colour. src/nsterm.m (ns_draw_vertical_window_border): This had the same bug as above, although I didn't see any errors. --- src/nsfns.m | 4 ++-- src/nsterm.m | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/nsfns.m b/src/nsfns.m index ea09908..9291f8e 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -983,8 +983,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side x_set_icon_name, x_set_icon_type, x_set_internal_border_width, /* generic OK */ - 0, /* x_set_right_divider_width */ - 0, /* x_set_bottom_divider_width */ + x_set_right_divider_width, + x_set_bottom_divider_width, x_set_menu_bar_lines, x_set_mouse_color, x_explicitly_set_name, diff --git a/src/nsterm.m b/src/nsterm.m index 1d48c04..438054f 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2951,10 +2951,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors. NSTRACE ("ns_draw_vertical_window_border"); face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID); + + ns_focus (f, &r, 1); if (face) [ns_lookup_indexed_color(face->foreground, f) set]; - ns_focus (f, &r, 1); NSRectFill(r); ns_unfocus (f); } @@ -2973,10 +2974,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors. NSTRACE ("ns_draw_window_divider"); face = FACE_FROM_ID (f, WINDOW_DIVIDER_FACE_ID); + + ns_focus (f, &r, 1); if (face) [ns_lookup_indexed_color(face->foreground, f) set]; - ns_focus (f, &r, 1); NSRectFill(r); ns_unfocus (f); } -- 2.7.4 -- Alan Third