curses 1.5.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c363e2ee899bf325f21d679cdf68e78caec9959d8ae8d631e51aaefdf361470
-  data.tar.gz: f12600ce5a6c645604cc74813def3c0afa9fed11c2e4117f4c53d374b3b77018
+  metadata.gz: fb2bc3cbe268313c253f41ee1a5e5bbabe504fa69e7631fae89a0865f1298125
+  data.tar.gz: a534a9ec711119fd1739c5df302167efc550fc089b346ab89b97004096cce060
 SHA512:
-  metadata.gz: ee80959584814c5102f2e2e881c3da795833d4c682cd952b5484ad11d2aa14130916fef00fea1d42d345d3d75a1ced642fd0bb9b839414fa90615cace0ad34f8
-  data.tar.gz: de4842e3f63642306b6a914084d5979c12d81263eeffdf82f2b0c56fc1da8c3ccadb400971a8541811d0244c456428f42fb6e5c20655fb163e77f5571ec8a1c4
+  metadata.gz: 8be3f5ce383b3626e8cd3a2800408bb6fbc8abc98a24e13bd365d7e74e93c49aff2f2501d73a2db584bcd7250f2834215411cd1ab7511c7c4fd8a4457e55e56a
+  data.tar.gz: e67a948df315465f11539eda4bd9f751272c02a72bfa68b0546ade9b7af86d0f097ccebc9b9b318449958362ba99d748a23b63de76664b581e2ce675db509347

data/.devcontainer/Dockerfile

@@ -0,0 +1,132 @@
+FROM node:20
+
+ARG TZ
+ENV TZ="$TZ"
+
+ARG CLAUDE_CODE_VERSION=latest
+
+# Install GitHub CLI from official repository
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+  | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+  && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
+  > /etc/apt/sources.list.d/github-cli.list
+
+# Install basic development tools and iptables/ipset
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  less \
+  git \
+  procps \
+  sudo \
+  fzf \
+  zsh \
+  man-db \
+  unzip \
+  gnupg2 \
+  gh \
+  iptables \
+  ipset \
+  iproute2 \
+  dnsutils \
+  aggregate \
+  jq \
+  nano \
+  vim \
+  locales \
+  # Ruby build dependencies
+  build-essential \
+  libssl-dev \
+  libreadline-dev \
+  zlib1g-dev \
+  libyaml-dev \
+  libffi-dev \
+  libncurses-dev \
+  aspell \
+  aspell-en \
+  aspell-fr \
+  && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Configure locale
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+  locale-gen en_US.UTF-8
+
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+# Ensure default node user has access to /usr/local/share
+RUN mkdir -p /usr/local/share/npm-global && \
+  chown -R node:node /usr/local/share
+
+ARG USERNAME=node
+
+# Persist bash history.
+RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
+  && mkdir /commandhistory \
+  && touch /commandhistory/.bash_history \
+  && chown -R $USERNAME /commandhistory
+
+# Set `DEVCONTAINER` environment variable to help with orientation
+ENV DEVCONTAINER=true
+
+# Create workspace and config directories and set permissions
+RUN mkdir -p /workspace /home/node/.claude /home/node/.config/gh && \
+  chown -R node:node /workspace /home/node/.claude /home/node/.config/gh
+
+WORKDIR /workspace
+
+ARG GIT_DELTA_VERSION=0.18.2
+RUN ARCH=$(dpkg --print-architecture) && \
+  wget "https://github.com/dandavison/delta/releases/download/${GIT_DELTA_VERSION}/git-delta_${GIT_DELTA_VERSION}_${ARCH}.deb" && \
+  sudo dpkg -i "git-delta_${GIT_DELTA_VERSION}_${ARCH}.deb" && \
+  rm "git-delta_${GIT_DELTA_VERSION}_${ARCH}.deb"
+
+# Set up non-root user
+USER node
+
+# Install rbenv and ruby-build
+ARG RUBY_VERSION=4.0.1
+RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv && \
+  git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build && \
+  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.zshrc && \
+  echo 'eval "$(rbenv init - zsh)"' >> ~/.zshrc && \
+  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc && \
+  echo 'eval "$(rbenv init - bash)"' >> ~/.bashrc
+
+# Install Ruby
+ENV PATH="/home/node/.rbenv/bin:/home/node/.rbenv/shims:$PATH"
+RUN rbenv install ${RUBY_VERSION} && \
+  rbenv global ${RUBY_VERSION} && \
+  gem install bundler
+
+# Install global packages
+ENV NPM_CONFIG_PREFIX=/usr/local/share/npm-global
+ENV PATH=$PATH:/usr/local/share/npm-global/bin
+
+# Set the default shell to zsh rather than sh
+ENV SHELL=/bin/zsh
+
+# Set the default editor and visual
+ENV EDITOR=nano
+ENV VISUAL=nano
+
+# Default powerline10k theme
+ARG ZSH_IN_DOCKER_VERSION=1.2.0
+RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v${ZSH_IN_DOCKER_VERSION}/zsh-in-docker.sh)" -- \
+  -p git \
+  -p fzf \
+  -a "source /usr/share/doc/fzf/examples/key-bindings.zsh" \
+  -a "source /usr/share/doc/fzf/examples/completion.zsh" \
+  -a "export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
+  -x
+
+# Install Claude
+RUN curl -fsSL https://claude.ai/install.sh | bash
+
+
+# Copy and set up firewall script
+COPY init-firewall.sh /usr/local/bin/
+USER root
+RUN chmod +x /usr/local/bin/init-firewall.sh && \
+  echo "node ALL=(root) NOPASSWD: /usr/local/bin/init-firewall.sh" > /etc/sudoers.d/node-firewall && \
+  chmod 0440 /etc/sudoers.d/node-firewall
+USER node

data/.devcontainer/devcontainer.json

@@ -0,0 +1,58 @@
+{
+  "name": "Claude Code Sandbox",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      "TZ": "${localEnv:TZ:America/Los_Angeles}",
+      "CLAUDE_CODE_VERSION": "latest",
+      "GIT_DELTA_VERSION": "0.18.2",
+      "ZSH_IN_DOCKER_VERSION": "1.2.0"
+    }
+  },
+  "runArgs": [
+    "--cap-add=NET_ADMIN",
+    "--cap-add=NET_RAW"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "anthropic.claude-code",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.codeActionsOnSave": {
+          "source.fixAll.eslint": "explicit"
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh",
+        "terminal.integrated.profiles.linux": {
+          "bash": {
+            "path": "bash",
+            "icon": "terminal-bash"
+          },
+          "zsh": {
+            "path": "zsh"
+          }
+        }
+      }
+    }
+  },
+  "remoteUser": "node",
+  "mounts": [
+    "source=claude-code-bashhistory-${devcontainerId},target=/commandhistory,type=volume",
+    "source=claude-code-config,target=/home/node/.claude,type=volume",
+    "source=claude-code-gh-config,target=/home/node/.config/gh,type=volume"
+  ],
+  "containerEnv": {
+    "NODE_OPTIONS": "--max-old-space-size=4096",
+    "CLAUDE_CONFIG_DIR": "/home/node/.claude",
+    "POWERLEVEL9K_DISABLE_GITSTATUS": "true"
+  },
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated",
+  "workspaceFolder": "/workspace",
+  "postStartCommand": "sudo /usr/local/bin/init-firewall.sh",
+  "waitFor": "postStartCommand"
+}

data/.devcontainer/init-firewall.sh

@@ -0,0 +1,139 @@
+#!/bin/bash
+set -euo pipefail  # Exit on error, undefined vars, and pipeline failures
+IFS=$'\n\t'       # Stricter word splitting
+
+# 1. Extract Docker DNS info BEFORE any flushing
+DOCKER_DNS_RULES=$(iptables-save -t nat | grep "127\.0\.0\.11" || true)
+
+# Flush existing rules and delete existing ipsets
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+ipset destroy allowed-domains 2>/dev/null || true
+
+# 2. Selectively restore ONLY internal Docker DNS resolution
+if [ -n "$DOCKER_DNS_RULES" ]; then
+    echo "Restoring Docker DNS rules..."
+    iptables -t nat -N DOCKER_OUTPUT 2>/dev/null || true
+    iptables -t nat -N DOCKER_POSTROUTING 2>/dev/null || true
+    echo "$DOCKER_DNS_RULES" | xargs -L 1 iptables -t nat
+else
+    echo "No Docker DNS rules to restore"
+fi
+
+# First allow DNS and localhost before any restrictions
+# Allow outbound DNS
+iptables -A OUTPUT -p udp --dport 53 -j ACCEPT
+# Allow inbound DNS responses
+iptables -A INPUT -p udp --sport 53 -j ACCEPT
+# Allow outbound SSH
+iptables -A OUTPUT -p tcp --dport 22 -j ACCEPT
+# Allow inbound SSH responses
+iptables -A INPUT -p tcp --sport 22 -m state --state ESTABLISHED -j ACCEPT
+# Allow localhost
+iptables -A INPUT -i lo -j ACCEPT
+iptables -A OUTPUT -o lo -j ACCEPT
+
+# Create ipset with CIDR support
+ipset create allowed-domains hash:net
+
+# Fetch GitHub meta information and aggregate + add their IP ranges
+echo "Fetching GitHub IP ranges..."
+gh_ranges=$(curl -s https://api.github.com/meta)
+if [ -z "$gh_ranges" ]; then
+    echo "ERROR: Failed to fetch GitHub IP ranges"
+    exit 1
+fi
+
+if ! echo "$gh_ranges" | jq -e '.web and .api and .git' >/dev/null; then
+    echo "ERROR: GitHub API response missing required fields"
+    exit 1
+fi
+
+echo "Processing GitHub IPs..."
+while read -r cidr; do
+    if [[ ! "$cidr" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/[0-9]{1,2}$ ]]; then
+        echo "ERROR: Invalid CIDR range from GitHub meta: $cidr"
+        exit 1
+    fi
+    echo "Adding GitHub range $cidr"
+    ipset add allowed-domains "$cidr"
+done < <(echo "$gh_ranges" | jq -r '(.web + .api + .git)[]' | aggregate -q)
+
+# Resolve and add other allowed domains
+for domain in \
+    "storage.googleapis.com" \
+    "registry.npmjs.org" \
+    "api.anthropic.com" \
+    "sentry.io" \
+    "statsig.anthropic.com" \
+    "statsig.com" \
+    "marketplace.visualstudio.com" \
+    "vscode.blob.core.windows.net" \
+    "update.code.visualstudio.com" \
+    "rubygems.org"; do
+    echo "Resolving $domain..."
+    ips=$(dig +noall +answer A "$domain" | awk '$4 == "A" {print $5}')
+    if [ -z "$ips" ]; then
+        echo "ERROR: Failed to resolve $domain"
+        exit 1
+    fi
+    
+    while read -r ip; do
+        if [[ ! "$ip" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            echo "ERROR: Invalid IP from DNS for $domain: $ip"
+            exit 1
+        fi
+        echo "Adding $ip for $domain"
+        ipset add allowed-domains "$ip"
+    done < <(echo "$ips")
+done
+
+# Get host IP from default route
+HOST_IP=$(ip route | grep default | cut -d" " -f3)
+if [ -z "$HOST_IP" ]; then
+    echo "ERROR: Failed to detect host IP"
+    exit 1
+fi
+
+HOST_NETWORK=$(echo "$HOST_IP" | sed "s/\.[0-9]*$/.0\/24/")
+echo "Host network detected as: $HOST_NETWORK"
+
+# Set up remaining iptables rules
+iptables -A INPUT -s "$HOST_NETWORK" -j ACCEPT
+iptables -A OUTPUT -d "$HOST_NETWORK" -j ACCEPT
+
+# Set default policies to DROP first
+iptables -P INPUT DROP
+iptables -P FORWARD DROP
+iptables -P OUTPUT DROP
+
+# First allow established connections for already approved traffic
+iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+# Then allow only specific outbound traffic to allowed domains
+iptables -A OUTPUT -m set --match-set allowed-domains dst -j ACCEPT
+
+# Explicitly REJECT all other outbound traffic for immediate feedback
+iptables -A OUTPUT -j REJECT --reject-with icmp-admin-prohibited
+
+echo "Firewall configuration complete"
+echo "Verifying firewall rules..."
+if curl --connect-timeout 5 https://example.com >/dev/null 2>&1; then
+    echo "ERROR: Firewall verification failed - was able to reach https://example.com"
+    exit 1
+else
+    echo "Firewall verification passed - unable to reach https://example.com as expected"
+fi
+
+# Verify GitHub API access
+if ! curl --connect-timeout 5 https://api.github.com/zen >/dev/null 2>&1; then
+    echo "ERROR: Firewall verification failed - unable to reach https://api.github.com"
+    exit 1
+else
+    echo "Firewall verification passed - able to reach https://api.github.com as expected"
+fi

data/.github/workflows/gh-pages.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Setup Ruby
         uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
@@ -27,14 +27,14 @@ jobs:
           bundler-cache: true
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
       - name: Install dependencies
         run: gem install rdoc
       - name: Build with RDoc
         # Outputs to the './_site' directory by default
         run: rake rdoc
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
 
   deploy:
     environment:
@@ -45,4 +45,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

data/.github/workflows/macos.yml

@@ -1,12 +1,15 @@
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [main]
+  pull_request:
 
 jobs:
   build:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 3.4

data/.github/workflows/push_gem.yml

@@ -24,11 +24,11 @@ jobs:
     steps:
       # Set up
       - name: Harden Runner
-        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: true
 
@@ -38,6 +38,11 @@ jobs:
           bundler-cache: true
           ruby-version: ruby
 
+      # Prevent `git fetch --tags` in release-gem from fetching submodule
+      # commits unreachable in the current submodule remote
+      - name: Disable submodule fetch recursion
+        run: git config fetch.recurseSubmodules false
+
       # Release
       - name: Publish to RubyGems
         uses: rubygems/release-gem@v1

data/.github/workflows/ubuntu.yml

@@ -1,6 +1,9 @@
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [main]
+  pull_request:
 
 jobs:
   test:
@@ -9,7 +12,7 @@ jobs:
         ruby: [ head, 3.4, 3.3, 3.2 ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.github/workflows/windows.yml

@@ -1,6 +1,9 @@
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [main]
+  pull_request:
 
 jobs:
   build:
@@ -9,7 +12,7 @@ jobs:
       matrix:
         ruby: [ 'mingw', 'mswin', '3.4' ]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: true
     - name: Set up Ruby

data/README.md

@@ -53,7 +53,7 @@ Type the following command, and see `[rdoc]` of curses:
 
 ## Limitations
 
-* curses.gem doesn't support more than 256 color pairs.  See https://reversed.top/2019-02-05/more-than-256-curses-color-pairs/ for details.
+* On ncurses 6+ compiled with extended color support, more than 256 color pairs are supported transparently via the extended colors API (`init_extended_pair`, etc.). Use `Curses.support_extended_colors?` to check at runtime.
 
 ## Developers
 

data/curses.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.5.4"
+  s.version = "1.6.1"
   s.author = ["Shugo Maeda", 'Eric Hodel']
   s.email = ["shugo@ruby-lang.org", 'drbrain@segment7.net']
   s.homepage = "https://github.com/ruby/curses"

data/ext/curses/curses.c

@@ -1321,7 +1321,11 @@ curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
 {
     /* may have to raise exception on ERR */
     curses_stdscr();
+#ifdef HAVE_INIT_EXTENDED_PAIR
+    return (init_extended_pair(NUM2INT(pair), NUM2INT(f), NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+#else
     return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+#endif
 }
 
 /*
@@ -1345,8 +1349,13 @@ curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
 {
     /* may have to raise exception on ERR */
     curses_stdscr();
+#ifdef HAVE_INIT_EXTENDED_COLOR
+    return (init_extended_color(NUM2INT(color), NUM2INT(r),
+				NUM2INT(g), NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+#else
     return (init_color(NUM2INT(color),NUM2INT(r),
 		       NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+#endif
 }
 
 /*
@@ -1397,11 +1406,22 @@ curses_colors(VALUE obj)
 static VALUE
 curses_color_content(VALUE obj, VALUE color)
 {
-    short r,g,b;
-
     curses_stdscr();
-    color_content(NUM2INT(color),&r,&g,&b);
-    return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
+#ifdef HAVE_EXTENDED_COLOR_CONTENT
+    {
+	int r, g, b;
+	if (extended_color_content(NUM2INT(color), &r, &g, &b) == ERR)
+	    return Qnil;
+	return rb_ary_new3(3, INT2FIX(r), INT2FIX(g), INT2FIX(b));
+    }
+#else
+    {
+	short r, g, b;
+	if (color_content(NUM2INT(color), &r, &g, &b) == ERR)
+	    return Qnil;
+	return rb_ary_new3(3, INT2FIX(r), INT2FIX(g), INT2FIX(b));
+    }
+#endif
 }
 
 
@@ -1430,11 +1450,22 @@ curses_color_pairs(VALUE obj)
 static VALUE
 curses_pair_content(VALUE obj, VALUE pair)
 {
-    short f,b;
-
     curses_stdscr();
-    pair_content(NUM2INT(pair),&f,&b);
-    return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
+#ifdef HAVE_EXTENDED_PAIR_CONTENT
+    {
+	int f, b;
+	if (extended_pair_content(NUM2INT(pair), &f, &b) == ERR)
+	    return Qnil;
+	return rb_ary_new3(2, INT2FIX(f), INT2FIX(b));
+    }
+#else
+    {
+	short f, b;
+	if (pair_content(NUM2INT(pair), &f, &b) == ERR)
+	    return Qnil;
+	return rb_ary_new3(2, INT2FIX(f), INT2FIX(b));
+    }
+#endif
 }
 
 /*
@@ -1465,6 +1496,41 @@ curses_pair_number(VALUE obj, VALUE attrs)
     curses_stdscr();
     return INT2FIX(PAIR_NUMBER(NUM2CHTYPE(attrs)));
 }
+
+/*
+ * Document-method: Curses.support_extended_colors?
+ *
+ * Returns +true+ if the ncurses library was compiled with extended color
+ * support (i.e., init_extended_pair, init_extended_color, etc. are available),
+ * +false+ otherwise.
+ */
+static VALUE
+curses_support_extended_colors(VALUE obj)
+{
+#if defined(HAVE_INIT_EXTENDED_PAIR) && defined(HAVE_INIT_EXTENDED_COLOR) && \
+    defined(HAVE_EXTENDED_COLOR_CONTENT) && defined(HAVE_EXTENDED_PAIR_CONTENT)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * Document-method: Curses.reset_color_pairs
+ *
+ * Resets all color pairs to undefined. Requires ncurses 6.1+.
+ */
+#ifdef HAVE_RESET_COLOR_PAIRS
+static VALUE
+curses_reset_color_pairs(VALUE obj)
+{
+    curses_stdscr();
+    reset_color_pairs();
+    return Qnil;
+}
+#else
+#define curses_reset_color_pairs rb_f_notimplement
+#endif
 #endif /* USE_COLOR */
 
 #ifdef USE_MOUSE
@@ -2717,7 +2783,7 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 #endif
 }
 
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+#if defined(USE_COLOR) && ((defined(HAVE_WATTR_SET) && defined(HAVE_WATTR_GET)) || defined(HAVE_WCOLOR_SET))
 /*
  * Document-method: Curses::Window.color_set
  * call-seq: color_set(col)
@@ -2729,13 +2795,26 @@ static VALUE
 window_color_set(VALUE obj, VALUE col)
 {
     struct windata *winp;
-    int res;
 
     GetWINDOW(obj, winp);
-    res = wcolor_set(winp->window, NUM2INT(col), NULL);
-    return (res == OK) ? Qtrue : Qfalse;
+#if defined(HAVE_WATTR_SET) && defined(HAVE_WATTR_GET)
+    /* Use wattr_set to support pair numbers > 255; preserve existing attrs. */
+    {
+	attr_t attrs;
+#ifdef NCURSES_PAIRS_T
+	NCURSES_PAIRS_T current_pair;
+#else
+	short current_pair;
+#endif
+	if (wattr_get(winp->window, &attrs, &current_pair, NULL) == ERR)
+	    return Qfalse;
+	return (wattr_set(winp->window, attrs, NUM2INT(col), NULL) == OK) ? Qtrue : Qfalse;
+    }
+#else
+    return (wcolor_set(winp->window, NUM2INT(col), NULL) == OK) ? Qtrue : Qfalse;
+#endif
 }
-#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
+#endif /* defined(USE_COLOR) && ((defined(HAVE_WATTR_SET) && defined(HAVE_WATTR_GET)) || defined(HAVE_WCOLOR_SET)) */
 
 /*
  * Document-method: Curses::Window.scroll
@@ -2870,6 +2949,60 @@ window_attrset(VALUE obj, VALUE attrs)
 #endif
 }
 
+/*
+ * Document-method: Curses::Window.attr_set
+ * call-seq: attr_set(attrs, pair)
+ *
+ * Sets the current attributes and color pair of the given window.
+ * Unlike Curses::Window.attrset, this method accepts an extended color
+ * pair number (> 255) when the ncurses extended colors API is available.
+ *
+ * Returns +true+ on success, +false+ on failure.
+ *
+ * see also system manual curs_attr(3)
+ */
+#ifdef HAVE_WATTR_SET
+static VALUE
+window_attr_set(VALUE obj, VALUE attrs, VALUE pair)
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+    return (wattr_set(winp->window, NUM2UINT(attrs), NUM2INT(pair), NULL) == OK) ? Qtrue : Qfalse;
+}
+#endif
+
+/*
+ * Document-method: Curses::Window.attr_get
+ * call-seq: attr_get => [attrs, pair]
+ *
+ * Returns a 2-element Array of the current attributes and color pair
+ * of the given window. The color pair number may exceed 255 when the
+ * ncurses extended colors API is available.
+ *
+ * Returns +nil+ on failure.
+ *
+ * see also system manual curs_attr(3)
+ */
+#ifdef HAVE_WATTR_GET
+static VALUE
+window_attr_get(VALUE obj)
+{
+    struct windata *winp;
+    attr_t attrs;
+#ifdef NCURSES_PAIRS_T
+    NCURSES_PAIRS_T pair;
+#else
+    short pair;
+#endif
+
+    GetWINDOW(obj, winp);
+    if (wattr_get(winp->window, &attrs, &pair, NULL) == ERR)
+	return Qnil;
+    return rb_ary_new3(2, UINT2NUM(attrs), INT2NUM(pair));
+}
+#endif
+
 /*
  * Document-method: Curses::Window.bkgdset
  * call-seq: bkgdset(ch)
@@ -5071,6 +5204,8 @@ Init_curses(void)
     rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
     rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
     rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
+    rb_define_module_function(mCurses, "support_extended_colors?", curses_support_extended_colors, 0);
+    rb_define_module_function(mCurses, "reset_color_pairs", curses_reset_color_pairs, 0);
 #endif /* USE_COLOR */
 #ifdef USE_MOUSE
     rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
@@ -5203,9 +5338,9 @@ Init_curses(void)
     rb_define_method(cWindow, "move", window_move, 2);
     rb_define_method(cWindow, "move_relative", window_move_relative, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+#if defined(USE_COLOR) && ((defined(HAVE_WATTR_SET) && defined(HAVE_WATTR_GET)) || defined(HAVE_WCOLOR_SET))
     rb_define_method(cWindow, "color_set", window_color_set, 1);
-#endif /* USE_COLOR && HAVE_WCOLOR_SET */
+#endif
     rb_define_method(cWindow, "cury", window_cury, 0);
     rb_define_method(cWindow, "curx", window_curx, 0);
     rb_define_method(cWindow, "maxy", window_maxy, 0);
@@ -5236,6 +5371,12 @@ Init_curses(void)
     rb_define_method(cWindow, "attroff", window_attroff, 1);
     rb_define_method(cWindow, "attron", window_attron, 1);
     rb_define_method(cWindow, "attrset", window_attrset, 1);
+#ifdef HAVE_WATTR_SET
+    rb_define_method(cWindow, "attr_set", window_attr_set, 2);
+#endif
+#ifdef HAVE_WATTR_GET
+    rb_define_method(cWindow, "attr_get", window_attr_get, 0);
+#endif
     rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
     rb_define_method(cWindow, "bkgd", window_bkgd, 1);
     rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);

data/ext/curses/extconf.rb

@@ -68,7 +68,7 @@ if $use_bundled_pdcurses
       $pdcurses_dll_default = true
     else
       w64 = $x64 ? "_w64=1" : ""
-      exec_command "make -f Makefile.mng clean all #{w64} WIDE=Y DLL=N CC=\"gcc -std=gnu17\""
+      exec_command "make -f Makefile.mng clean libs #{w64} WIDE=Y DLL=N CC=\"gcc -std=gnu17\""
       FileUtils.cp("pdcurses.a", File.expand_path("libpdcurses.a", pdcurses_dir))
     end
   ensure
@@ -119,7 +119,9 @@ if header_library
               def_prog_mode reset_prog_mode timeout wtimeout nodelay
               init_color wcolor_set use_default_colors assume_default_colors
               newpad unget_wch get_wch wget_wch PDC_get_key_modifiers
-              chgat wchgat newterm)
+              chgat wchgat newterm
+              init_extended_color init_extended_pair extended_color_content
+              extended_pair_content reset_color_pairs wattr_set wattr_get)
     have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
   end
   convertible_int('chtype', [["#undef MOUSE_MOVED\n"]]+curses) or abort

data/sample/colors.rb

@@ -5,6 +5,7 @@ include Curses
 
 # The TERM environment variable should be set to xterm-256color etc. to
 # use 256 colors.  Curses.colors returns the color numbers of the terminal.
+# With ncurses 6+ extended color support, color_pairs may exceed 256.
 
 begin
   init_screen
@@ -14,14 +15,24 @@ begin
   else
     start_color
 
-    addstr "This Terminal supports #{colors} colors.\n"
-
-    Curses.colors.times { |i|
-      Curses.init_pair(i, i, 0)
-      attrset(color_pair(i))
+    extended = Curses.support_extended_colors?
+    addstr "This Terminal supports #{colors} colors, #{color_pairs} pairs"
+    addstr extended ? " (extended).\n" : ".\n"
+
+    (extended ? [512, color_pairs].min : colors).times { |i|
+      next if i == 0
+      Curses.init_pair(i, i % colors, (i / colors) % colors)
+      if extended
+        # color_pair() encodes into chtype and can't handle pairs > 255;
+        # use color_set on stdscr instead, which calls wattr_set internally.
+        stdscr.color_set(i)
+      else
+        attrset(color_pair(i))
+      end
       addstr("#{i.to_s.rjust(3)} ")
       addstr("\n") if i == 15 || (i > 16 && (i - 15) % 36 == 0)
     }
+    stdscr.color_set(0)
   end
 
   getch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.1
 platform: ruby
 authors:
 - Shugo Maeda
@@ -46,6 +46,9 @@ extensions:
 - ext/curses/extconf.rb
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/init-firewall.sh"
 - ".github/dependabot.yml"
 - ".github/release.yml"
 - ".github/workflows/gh-pages.yml"
@@ -345,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension
   library for text UI applications. Formerly part of the Ruby standard library, [curses