← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xterm/trusty-proposed

« back to all changes in this revision

Viewing changes to menu.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-17 10:40:36 UTC
  • mfrom: (1.4.12 upstream) (11.1.26 sid)
  • Revision ID: james.westby@ubuntu.com-20110617104036-id4ml81yetasewp9
Tags: 270-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled URL
    highlighting
  - debian/patches/Add 951_uxterm_utf8_title.diff: Set utf8Titles to true by
    default when using uxterm, so that it displays utf8 directories in titles
    properly.  May cause issues with apps that use control sequences for
    updating the xterm titlebar - users should use xterm or set utf8Title
    to false in this case.
  - debian/gbp.conf: Use "Ubuntu" in "debian-branch" directly

Show diffs side-by-side

added added

removed removed

Lines of Context:
menu.h
1
 
/* $XTermId: menu.h,v 1.122 2011/01/20 09:42:50 tom Exp $ */
 
1
/* $XTermId: menu.h,v 1.124 2011/04/23 12:14:21 tom Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright 1999-2010,2011 by Thomas E. Dickey
76
76
 
77
77
extern void Handle8BitControl      PROTO_XT_ACTIONS_ARGS;
78
78
extern void HandleAllow132         PROTO_XT_ACTIONS_ARGS;
 
79
extern void HandleAllowBoldFonts   PROTO_XT_ACTIONS_ARGS;
79
80
extern void HandleAllowColorOps    PROTO_XT_ACTIONS_ARGS;
80
81
extern void HandleAllowFontOps     PROTO_XT_ACTIONS_ARGS;
81
82
extern void HandleAllowSends       PROTO_XT_ACTIONS_ARGS;
138
139
extern void HandleTiteInhibit      PROTO_XT_ACTIONS_ARGS;
139
140
extern void HandleToolbar          PROTO_XT_ACTIONS_ARGS;
140
141
extern void HandleUTF8Mode         PROTO_XT_ACTIONS_ARGS;
 
142
extern void HandleUTF8Fonts        PROTO_XT_ACTIONS_ARGS;
141
143
extern void HandleUTF8Title        PROTO_XT_ACTIONS_ARGS;
142
144
extern void HandleVisibility       PROTO_XT_ACTIONS_ARGS;
143
145
 
268
270
 
269
271
#if OPT_DEC_CHRSET || OPT_BOX_CHARS || OPT_DEC_SOFTFONT
270
272
    fontMenu_line1,
 
273
    fontMenu_allowBoldFonts,
271
274
#if OPT_BOX_CHARS
272
275
    fontMenu_font_boxchars,
273
276
    fontMenu_font_packedfont,
286
289
    fontMenu_render_font,
287
290
#endif
288
291
#if OPT_WIDE_CHARS
289
 
    fontMenu_wide_chars,
290
 
    fontMenu_wide_title,
 
292
    fontMenu_utf8_mode,
 
293
    fontMenu_utf8_fonts,
 
294
    fontMenu_utf8_title,
291
295
#endif
292
296
#endif
293
297
#if OPT_ALLOW_XXX_OPS
419
423
 
420
424
#define update_marginbell() /* nothing */
421
425
 
 
426
extern void update_menu_allowBoldFonts(void);
 
427
 
422
428
#if OPT_ALLOW_XXX_OPS
423
429
extern void update_menu_allowColorOps(void);
424
430
extern void update_menu_allowFontOps(void);
468
474
 
469
475
#if OPT_WIDE_CHARS
470
476
extern void update_font_utf8_mode(void);
 
477
extern void update_font_utf8_fonts(void);
471
478
extern void update_font_utf8_title(void);
472
479
#else
473
480
#define update_font_utf8_mode() /* nothing */
 
481
#define update_font_utf8_fonts() /* nothing */
474
482
#define update_font_utf8_title() /* nothing */
475
483
#endif
476
484