~ubuntu-branches/ubuntu/saucy/xterm/saucy-proposed

« back to all changes in this revision

Viewing changes to xtermcap.c

  • Committer: Bazaar Package Importer
  • Author(s): Ryan Kavanagh
  • Date: 2008-11-23 17:15:10 UTC
  • mfrom: (1.1.10 upstream) (11.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20081123171510-fdwvfr4ytnfvjwjl
Tags: 237-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - Enabled URL hilighting
  - Maintainer field
  - rm -rf for .pc patches
* Closes (LP: #301451)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $XTermId: xtermcap.c,v 1.12 2007/12/31 17:27:42 tom Exp $ */
 
1
/* $XTermId: xtermcap.c,v 1.13 2008/07/27 15:18:56 tom Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright 2007 by Thomas E. Dickey
48
48
#define USE_TERMINFO 0
49
49
#endif
50
50
 
 
51
#if USE_TERMINFO && defined(NCURSES_VERSION) && defined(HAVE_USE_EXTENDED_NAMES)
 
52
#define USE_EXTENDED_NAMES 1
 
53
#else
 
54
#define USE_EXTENDED_NAMES 0
 
55
#endif
 
56
 
51
57
#if OPT_TCAP_QUERY || OPT_TCAP_FKEYS
52
58
 
53
59
typedef struct {
164
170
        /* XK_COLORS is a fake code. */
165
171
        DATA(   "Co",   "colors",       XK_COLORS,      0       ),
166
172
# endif
167
 
#if USE_TERMINFO && defined(NCURSES_VERSION)
 
173
#if USE_EXTENDED_NAMES
168
174
#define DEXT(name, parm, code) DATA("", name, code, parm)
169
175
#define D1ST(name, parm, code) DEXT("k" #name, parm, code)
170
176
#define DMOD(name, parm, code) DEXT("k" #name #parm, parm, code)
378
384
{
379
385
    *buffer = 0;                /* initialize, in case we're using terminfo's tgetent */
380
386
 
381
 
#if USE_TERMINFO && defined(NCURSES_VERSION)
 
387
#if USE_EXTENDED_NAMES
382
388
    use_extended_names(TRUE);
383
389
#endif
384
390
    if (name != 0) {