← Back to branch summary

~ubuntu-branches/debian/sid/ncurses/sid-200908151543

« back to all changes in this revision

Viewing changes to ncurses/base/lib_slkatron.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-05-24 15:13:01 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090524151301-uixgxq2zonfov2nr
Tags: 5.7+20090523-1
Merging upstream version 5.7+20090523.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ncurses/base/lib_slkatron.c
1
1
/****************************************************************************
2
 
 * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
 
2
 * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
3
3
 *                                                                          *
4
4
 * Permission is hereby granted, free of charge, to any person obtaining a  *
5
5
 * copy of this software and associated documentation files (the            *
38
38
 */
39
39
#include <curses.priv.h>
40
40
 
41
 
MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $")
 
41
MODULE_ID("$Id: lib_slkatron.c,v 1.10 2009/02/21 18:16:04 tom Exp $")
42
42
 
43
43
NCURSES_EXPORT(int)
44
 
slk_attron(const chtype attr)
 
44
NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
45
45
{
46
 
    T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
 
46
    T((T_CALLED("slk_attron(%p,%s)"), SP_PARM, _traceattr(attr)));
47
47
 
48
 
    if (SP != 0 && SP->_slk != 0) {
49
 
        TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
50
 
        AddAttr(SP->_slk->attr, attr);
 
48
    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
 
49
        TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
 
50
        AddAttr(SP_PARM->_slk->attr, attr);
51
51
        if ((attr & A_COLOR) != 0) {
52
 
            SetPair(SP->_slk->attr, PAIR_NUMBER(attr));
 
52
            SetPair(SP_PARM->_slk->attr, PAIR_NUMBER(attr));
53
53
        }
54
 
        TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
 
54
        TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
55
55
        returnCode(OK);
56
56
    } else
57
57
        returnCode(ERR);
58
58
}
 
59
 
 
60
#if NCURSES_SP_FUNCS
 
61
NCURSES_EXPORT(int)
 
62
slk_attron(const chtype attr)
 
63
{
 
64
    return NCURSES_SP_NAME(slk_attron) (CURRENT_SCREEN, attr);
 
65
}
 
66
#endif