Skip to content

Use NUM2CHTYPE() and CHTYPE2NUM() for PDCurses #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shugo merged 1 commit into from
Feb 13, 2025
Merged

Use NUM2CHTYPE() and CHTYPE2NUM() for PDCurses #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/curses/curses.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,7 +1443,7 @@ curses_pair_content(VALUE obj, VALUE pair)
static VALUE
curses_color_pair(VALUE obj, VALUE attrs)
{
return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
return CHTYPE2NUM(COLOR_PAIR(NUM2CHTYPE(attrs)));
}

/*
Expand All @@ -1456,7 +1456,7 @@ static VALUE
curses_pair_number(VALUE obj, VALUE attrs)
{
curses_stdscr();
return INT2FIX(PAIR_NUMBER(NUM2LONG(attrs)));
return INT2FIX(PAIR_NUMBER(NUM2CHTYPE(attrs)));
}
#endif /* USE_COLOR */

Expand Down Expand Up @@ -2672,7 +2672,7 @@ window_attroff(VALUE obj, VALUE attrs)
struct windata *winp;

GetWINDOW(obj,winp);
return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
return INT2FIX(wattroff(winp->window,NUM2CHTYPE(attrs)));
#else
return Qtrue;
#endif
Expand All @@ -2695,10 +2695,10 @@ window_attron(VALUE obj, VALUE attrs)
VALUE val;

GetWINDOW(obj,winp);
val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
val = INT2FIX(wattron(winp->window,NUM2CHTYPE(attrs)));
if (rb_block_given_p()) {
rb_yield(val);
wattroff(winp->window,NUM2INT(attrs));
wattroff(winp->window,NUM2CHTYPE(attrs));
return val;
}
else{
Expand Down Expand Up @@ -2742,7 +2742,7 @@ window_attrset(VALUE obj, VALUE attrs)
struct windata *winp;

GetWINDOW(obj,winp);
return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
return INT2FIX(wattrset(winp->window,NUM2CHTYPE(attrs)));
#else
return Qtrue;
#endif
Expand Down