ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.34 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.52 by pcg, Sun Mar 14 17:33:08 2004 UTC

… …
12 12
13#include "defaultfont.h" 13#include "defaultfont.h"
14#include "rxvtcolor.h" 14#include "rxvtcolor.h"
15#include "iom.h" 15#include "iom.h"
16#include "salloc.h" 16#include "salloc.h"
17
18#include <wchar.h>
19 17
20/* 18/*
21 ***************************************************************************** 19 *****************************************************************************
22 * SYSTEM HACKS 20 * SYSTEM HACKS
23 ***************************************************************************** 21 *****************************************************************************
… …
49 int line; 47 int line;
50 int local; 48 int local;
51} ttymode_t; 49} ttymode_t;
52#endif 50#endif
53 51
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 52#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 53# ifdef XPM_INC_X11
59# include <X11/xpm.h> 54# include <X11/xpm.h>
60# else 55# else
61# include <xpm.h> 56# include <xpm.h>
… …
144 139
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION) 140#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly? 141# error if you disable both selection styles, how can you select, silly?
147#endif 142#endif
148 143
149#define APL_CLASS "XTerm" /* class name */
150#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
151#define APL_NAME "rxvt" /* normal name */
152
153/* COLORTERM, TERM environment variables */ 144/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 145#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 146#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 147# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 148#else
158# define COLORTERMENVFULL COLORTERMENV 149# define COLORTERMENVFULL COLORTERMENV
159#endif 150#endif
160#ifndef TERMENV 151#ifndef TERMENV
161# define TERMENV "xterm" 152# define TERMENV "rxvt"
162#endif 153#endif
163 154
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 155#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 156# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 157#endif
… …
272 * :............: 263 * :............:
273 * | 264 * |
274 * +---< SB_WIDTH_NEXT 265 * +---< SB_WIDTH_NEXT
275 */ 266 */
276 267
268enum {
277#define NO_REFRESH 0 /* Window not visible at all! */ 269 NO_REFRESH = 0 , /* Window not visible at all! */
278#define FAST_REFRESH (1<<0) /* Fully exposed window */ 270 FAST_REFRESH = 1<<0, /* Fully exposed window */
279#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 271 SLOW_REFRESH = 1<<1, /* Partially exposed window */
280#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 272 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
281#define REFRESH_BOUNDS (1<<3) 273 REFRESH_BOUNDS = 1<<3
274};
282 275
283#ifdef NO_SECONDARY_SCREEN 276#ifdef NO_SECONDARY_SCREEN
284# define NSCREENS 0 277# define NSCREENS 0
285#else 278#else
286# define NSCREENS 1 279# define NSCREENS 1
… …
294#define FONT_CMD '#' 287#define FONT_CMD '#'
295#define FONT_DN "#-" 288#define FONT_DN "#-"
296#define FONT_UP "#+" 289#define FONT_UP "#+"
297 290
298/* flags for rxvt_scr_gotorc () */ 291/* flags for rxvt_scr_gotorc () */
292enum {
299#define C_RELATIVE 1 /* col movement is relative */ 293 C_RELATIVE = 1 , /* col movement is relative */
300#define R_RELATIVE 2 /* row movement is relative */ 294 R_RELATIVE = 2, /* row movement is relative */
301#define RELATIVE (R_RELATIVE|C_RELATIVE) 295 RELATIVE = 1 | 2,
296};
302 297
303/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 298/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
304#define INSERT -1 /* don't change these values */ 299enum {
305#define DELETE +1 300 INSERT = -1, /* don't change these values */
306#define ERASE +2 301 DELETE = +1,
302 ERASE = +2,
303};
307 304
308/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 305/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
309enum page_dirn { 306enum page_dirn {
310 UP, 307 UP,
311 DN, 308 DN,
312 NO_DIR 309 NO_DIR,
313}; 310};
314 311
315/* arguments for rxvt_scr_change_screen () */ 312/* arguments for rxvt_scr_change_screen () */
316enum { 313enum {
317 PRIMARY = 0, 314 PRIMARY = 0,
318 SECONDARY 315 SECONDARY,
319}; 316};
320 317
321#define RS_None 0 /* Normal */ 318#define RS_None 0 /* Normal */
322 319
323#define RS_fgMask 0x000001FFu /* 512 colors */ 320#define RS_fgMask 0x000001FFu /* 512 colors */
… …
347enum { 344enum {
348 C0_NUL = 0x00, 345 C0_NUL = 0x00,
349 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 346 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
350 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 347 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
351 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 348 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
352 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 349 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
353}; 350};
354#define CHAR_ST 0x9c /* 0234 */ 351#define CHAR_ST 0x9c /* 0234 */
355 352
356/* 353/*
357 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 354 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
358 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 355 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
359 */ 356 */
357enum {
360#define XTerm_name 0 358 XTerm_name = 0,
361#define XTerm_iconName 1 359 XTerm_iconName = 1,
362#define XTerm_title 2 360 XTerm_title = 2,
361 XTerm_property = 3, // change X property, not yet implemented
363#define XTerm_Color 4 /* change colors */ 362 XTerm_Color = 4, // change colors
363 XTerm_Color00 = 10, // not implemented, CLASH!
364 XTerm_Color01 = 11, // not implemented
364#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 365 XTerm_Color_cursor = 12, // change actual 'Cursor' color
365#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 366 XTerm_Color_pointer = 13, // change actual 'Pointer' color
367 XTerm_Color04 = 14, // not implemented
368 XTerm_Color05 = 15, // not implemented
369 XTerm_Color06 = 16, // not implemented
366#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 370 XTerm_Color_RV = 17, // change actual 'Highlight' color
367#define XTerm_Color_BD 18 /* change actual 'Bold' color */
368#define XTerm_Color_UL 19 /* change actual 'Underline' color */
369#define XTerm_logfile 46 /* not implemented */ 371 XTerm_logfile = 46, // not implemented
370#define XTerm_font 50 372 XTerm_font = 50,
371 373
372/* 374 XTerm_konsole30 = 30, // reserved for konsole
375 XTerm_konsole31 = 31, // reserved for konsole
376 XTerm_emacs51 = 51, // reserved for emacs shell
377 /*
373 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 378 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
374 */ 379 */
375#define XTerm_Menu 10 /* set menu item */ 380 XTerm_Menu = 10, // set menu item
381 XTerm_Color_BD = 18, // change actual 'Bold' color
382 XTerm_Color_UL = 19, // change actual 'Underline' color
376#define XTerm_Pixmap 20 /* new bg pixmap */ 383 XTerm_Pixmap = 20, // new bg pixmap
377#define XTerm_restoreFG 39 /* change default fg color */ 384 XTerm_restoreFG = 39, // change default fg color
378#define XTerm_restoreBG 49 /* change default bg color */ 385 XTerm_restoreBG = 49, // change default bg color
379#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 386 XTerm_dumpscreen = 55, // dump scrollback and all of screen
387 XTerm_locale = 701, // change locale
388 XTerm_findfont = 702, // find font of given character (in decimal)
389};
380 390
381/* Words starting with `Color_' are colours. Others are counts */ 391/* Words starting with `Color_' are colours. Others are counts */
382/* 392/*
383 * The following comment is mostly obsolete since pixcolor_set was expanded: 393 * The following comment is mostly obsolete since pixcolor_set was expanded:
384 * We're currently upto 29 colours. Only 3 more available. The 394 * We're currently upto 29 colours. Only 3 more available. The
… …
473 Rs_backgroundPixmap, 483 Rs_backgroundPixmap,
474#endif 484#endif
475#if (MENUBAR_MAX) 485#if (MENUBAR_MAX)
476 Rs_menu, 486 Rs_menu,
477#endif 487#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 488 Rs_loginShell,
483 Rs_jumpScroll, 489 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 491 Rs_scrollBar,
486 Rs_scrollBar_right, 492 Rs_scrollBar_right,
… …
515#endif 521#endif
516#ifdef USE_XIM 522#ifdef USE_XIM
517 Rs_preeditType, 523 Rs_preeditType,
518 Rs_inputMethod, 524 Rs_inputMethod,
519#endif 525#endif
520#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
521 Rs_bigfont_key,
522 Rs_smallfont_key,
523#endif
524#ifdef TRANSPARENT 526#ifdef TRANSPARENT
525 Rs_transparent, 527 Rs_transparent,
526 Rs_transparent_all, 528 Rs_transparent_all,
527#endif 529#endif
528#ifndef NO_FRILLS 530#ifndef NO_FRILLS
… …
532 Rs_scrollBar_thickness, 534 Rs_scrollBar_thickness,
533#ifndef NO_LINESPACE 535#ifndef NO_LINESPACE
534 Rs_lineSpace, 536 Rs_lineSpace,
535#endif 537#endif
536 Rs_cutchars, 538 Rs_cutchars,
537#ifdef ACS_ASCII
538 Rs_acs_chars,
539#endif
540 Rs_modifier, 539 Rs_modifier,
541 Rs_answerbackstring, 540 Rs_answerbackstring,
542 Rs_tripleclickwords, 541 Rs_tripleclickwords,
543 Rs_cursorBlink, 542 Rs_cursorBlink,
544 Rs_pointerBlank, 543 Rs_pointerBlank,
… …
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 595#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 596#define PrivMode(test,bit) \
598 if (test) \ 597 if (test) \
599 PrivateModes |= (bit); \ 598 PrivateModes |= (bit); \
600 else \ 599 else \
601 PrivateModes &= ~ (bit) 600 PrivateModes &= ~(bit)
602 601
603#ifdef ALLOW_132_MODE 602#ifdef ALLOW_132_MODE
604# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 603# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
606#else 604#else
607# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 605# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 606#endif
610 607
611#define XDEPTH display->depth 608#define XDEPTH display->depth
612#define XCMAP display->cmap 609#define XCMAP display->cmap
613#define XVISUAL display->visual 610#define XVISUAL display->visual
… …
819 816
820// primivite wrapper around mbstate_t to ensure initialisation 817// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 818struct mbstate {
822 mbstate_t mbs; 819 mbstate_t mbs;
823 820
824 mbstate () 821 operator mbstate_t *() { return &mbs; }
822 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
823 mbstate () { reset (); }
824};
825
826#if UNICODE3
827# define COMPOSE_LO 0x40000000UL
828# define COMPOSE_HI 0x400fffffUL
829# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
830#else
831# define COMPOSE_LO 0xd800UL
832# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
833# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
834#endif
835
836#if ENABLE_COMBINING
837// compose chars are used to represent composite characters
838// that are not representable in unicode, as well as characters
839// not fitting in the BMP.
840struct compose_char {
841 uint32_t c1, c2; // any chars != NOCHAR are valid
842 compose_char (uint32_t c1, uint32_t c2)
843 : c1(c1), c2(c2)
844 { }
845};
846
847class rxvt_composite_vec {
848 vector<compose_char> v;
849public:
850 text_t compose (uint32_t c1, uint32_t c2 = NOCHAR);
851 int expand (uint32_t c, wchar_t *r);
852 compose_char *operator [](text_t c)
825 { 853 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 854 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
855 ? &v[c - COMPOSE_LO]
856 : 0;
827 } 857 }
828}; 858};
829 859
860extern class rxvt_composite_vec rxvt_composite;
861#endif
862
863
830struct rxvt_term : rxvt_vars { 864struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 865 struct mbstate mbstate;
832 866
833 unsigned char want_refresh:1, 867 unsigned char want_refresh:1,
834#ifdef TRANSPARENT 868#ifdef TRANSPARENT
835 want_full_refresh:1, /* awaiting full screen refresh */ 869 want_full_refresh:1, /* awaiting full screen refresh */
836#endif 870#endif
… …
867#endif 901#endif
868 scrollbar_align, 902 scrollbar_align,
869 selection_wait, 903 selection_wait,
870 selection_type; 904 selection_type;
871/* ---------- */ 905/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 906 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 907 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 908 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 909 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 910/* ---------- */
883 rend_t rstyle; 911 rend_t rstyle;
884/* ---------- */ 912/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 913 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 914/* ---------- */
… …
985 const char *key_backspace; 1013 const char *key_backspace;
986#endif 1014#endif
987#ifndef NO_DELETE_KEY 1015#ifndef NO_DELETE_KEY
988 const char *key_delete; 1016 const char *key_delete;
989#endif 1017#endif
990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
991 KeySym ks_bigfont, ks_smallfont;
992#endif
993#ifdef GREEK_SUPPORT
994 KeySym ks_greekmodeswith;
995#endif
996#ifdef USE_XIM 1018#ifdef USE_XIM
997 rxvt_xim *input_method; 1019 rxvt_xim *input_method;
998 XIC Input_Context; 1020 XIC Input_Context;
999 XIMStyle input_style; 1021 XIMStyle input_style;
1000 int event_type; 1022 int event_type;
1001#endif 1023#endif
1002 struct mouse_event MEvent; 1024 struct mouse_event MEvent;
1003 XComposeStatus compose; 1025 XComposeStatus compose;
1004#ifdef RXVT_GRAPHICS
1005 int graphics_up;
1006 struct grwin_t *gr_root;
1007#endif
1008 ttymode_t tio; 1026 ttymode_t tio;
1009#ifdef UTMP_SUPPORT 1027#ifdef UTMP_SUPPORT
1010# ifdef HAVE_STRUCT_UTMP 1028# ifdef HAVE_STRUCT_UTMP
1011 struct utmp ut; 1029 struct utmp ut;
1012# endif 1030# endif
… …
1021 row_col_t oldcursor; 1039 row_col_t oldcursor;
1022#ifdef XPM_BACKGROUND 1040#ifdef XPM_BACKGROUND
1023 bgPixmap_t bgPixmap; 1041 bgPixmap_t bgPixmap;
1024 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1042 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1025#endif 1043#endif
1026#ifdef MULTICHAR_SET
1027 int oldcursormulti;
1028 void (*multichar_decode) (unsigned char *str, int len);
1029#endif
1030#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1044#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1031 struct stat ttyfd_stat; /* original status of our tty */ 1045 struct stat ttyfd_stat; /* original status of our tty */
1032#endif 1046#endif
1033#ifdef MENUBAR 1047#ifdef MENUBAR
1034 menu_t *ActiveMenu, /* currently active menu */ 1048 menu_t *ActiveMenu, /* currently active menu */
1035 *BuildMenu; /* the menu currently being built */ 1049 *BuildMenu; /* the menu currently being built */
1036 bar_t *CurrentBar; 1050 bar_t *CurrentBar;
1037# if ! (MENUBAR_MAX > 1) 1051# if ! (MENUBAR_MAX > 1)
1038 bar_t BarList; 1052 bar_t BarList;
1039# endif /* (MENUBAR_MAX > 1) */ 1053# endif /* (MENUBAR_MAX > 1) */
1040#endif
1041#ifdef RXVT_GRAPHICS
1042 Window gr_last_id;
1043#endif 1054#endif
1044#ifdef CURSOR_BLINK 1055#ifdef CURSOR_BLINK
1045 struct timeval lastcursorchange; 1056 struct timeval lastcursorchange;
1046#endif 1057#endif
1047#ifdef POINTER_BLANK 1058#ifdef POINTER_BLANK
… …
1056 char *locale; 1067 char *locale;
1057 char *codeset; 1068 char *codeset;
1058 char charsets[4]; 1069 char charsets[4];
1059 unsigned char *v_buffer; /* pointer to physical buffer */ 1070 unsigned char *v_buffer; /* pointer to physical buffer */
1060 unsigned int v_buflen; /* size of area to write */ 1071 unsigned int v_buflen; /* size of area to write */
1061 char *newfont[MAX_NFONTS]; 1072 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1062#ifdef KEYSYM_RESOURCE 1073#ifdef KEYSYM_RESOURCE
1063 const unsigned char *Keysym_map[256]; 1074 const unsigned char *Keysym_map[256];
1064#endif 1075#endif
1065 const char *rs[NUM_RESOURCES]; 1076 const char *rs[NUM_RESOURCES];
1066/* command input buffering */ 1077/* command input buffering */
… …
1168 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1179 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1169 int scr_scroll_text (int row1, int row2, int count, int spec); 1180 int scr_scroll_text (int row1, int row2, int count, int spec);
1170 void scr_reset (); 1181 void scr_reset ();
1171 void scr_reset_realloc (); 1182 void scr_reset_realloc ();
1172 void scr_release (); 1183 void scr_release ();
1173 void scr_clear (); 1184 void scr_clear (bool really = true);
1174 void scr_refresh (unsigned char refresh_type); 1185 void scr_refresh (unsigned char refresh_type);
1175 bool scr_refresh_rend (rend_t mask, rend_t value); 1186 bool scr_refresh_rend (rend_t mask, rend_t value);
1176 void scr_erase_screen (int mode); 1187 void scr_erase_screen (int mode);
1177 void scr_touch (bool refresh); 1188 void scr_touch (bool refresh);
1178 void scr_expose (int x, int y, int width, int height, bool refresh); 1189 void scr_expose (int x, int y, int width, int height, bool refresh);
1190 void scr_remap_chars ();
1191 void scr_remap_chars (text_t *tp, rend_t *rp);
1179 1192
1180 /* autoconvert */ 1193 /* autoconvert */
1181 1194
1182 // command.C 1195 // command.C
1183 void lookup_key (XKeyEvent &ev); 1196 void lookup_key (XKeyEvent &ev);
1184 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1197 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1185 uint32_t cmd_getc (); 1198 uint32_t cmd_getc ();
1199 bool cmd_parse ();
1186 void mouse_report (const XButtonEvent &ev); 1200 void mouse_report (XButtonEvent &ev);
1187 void button_press (const XButtonEvent &ev); 1201 void button_press (XButtonEvent &ev);
1188 void button_release (const XButtonEvent &ev); 1202 void button_release (XButtonEvent &ev);
1189 int check_our_parents (); 1203 int check_our_parents ();
1190#ifdef PRINTPIPE 1204#ifdef PRINTPIPE
1191 FILE * popen_printer (); 1205 FILE *popen_printer ();
1192 int pclose_printer (FILE *stream); 1206 int pclose_printer (FILE *stream);
1193#endif 1207#endif
1194 void process_print_pipe (); 1208 void process_print_pipe ();
1195 void process_nonprinting (unsigned char ch); 1209 void process_nonprinting (unsigned char ch);
1196 void process_escape_vt52 (unsigned char ch); 1210 void process_escape_vt52 (unsigned char ch);
… …
1213 void cleanutent (); 1227 void cleanutent ();
1214 // main.C; 1228 // main.C;
1215 void privileges (int mode); 1229 void privileges (int mode);
1216 void privileged_utmp (char action); 1230 void privileged_utmp (char action);
1217 void privileged_ttydev (char action); 1231 void privileged_ttydev (char action);
1218 void change_font (int init, const char *fontname); 1232 bool change_font (const char *fontname);
1219 void font_up_down (int n, int direction); 1233 bool font_up_down (int n, int direction);
1220 void set_title (const char *str); 1234 void set_title (const char *str);
1221 void set_iconName (const char *str); 1235 void set_iconName (const char *str);
1222 void set_window_color (int idx, const char *color); 1236 void set_window_color (int idx, const char *color);
1223 void set_colorfgbg (); 1237 void set_colorfgbg ();
1224 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1238 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1228 // menubar.C 1242 // menubar.C
1229 void menuitem_free (menu_t *menu, menuitem_t *item); 1243 void menuitem_free (menu_t *menu, menuitem_t *item);
1230 int action_dispatch (action_t *action); 1244 int action_dispatch (action_t *action);
1231 void menuarrow_free (char name); 1245 void menuarrow_free (char name);
1232 void menuarrow_add (char *string); 1246 void menuarrow_add (char *string);
1233 char * menu_find_base (menu_t **menu, char *path); 1247 char *menu_find_base (menu_t **menu, char *path);
1234 menu_t * menu_delete (menu_t *menu); 1248 menu_t *menu_delete (menu_t *menu);
1235 menu_t * menu_add (menu_t *parent, char *path); 1249 menu_t *menu_add (menu_t *parent, char *path);
1236 void drawbox_menubar (int x, int len, int state); 1250 void drawbox_menubar (int x, int len, int state);
1237 void drawtriangle (int x, int y, int state); 1251 void drawtriangle (int x, int y, int state);
1238 void drawbox_menuitem (int y, int state); 1252 void drawbox_menuitem (int y, int state);
1239 void menu_show (); 1253 void menu_show ();
1240 void menu_display (void (*update) (rxvt_t *)); 1254 void menu_display (void (rxvt_term::*update) ());
1241 void menu_hide_all (); 1255 void menu_hide_all ();
1242 void menu_hide (); 1256 void menu_hide ();
1243 void menu_clear (menu_t *menu); 1257 void menu_clear (menu_t *menu);
1244 void menubar_clear (); 1258 void menubar_clear ();
1245 bar_t * menubar_find (const char *name); 1259 bar_t *menubar_find (const char *name);
1246 int menubar_push (const char *name); 1260 int menubar_push (const char *name);
1247 void menubar_remove (const char *name); 1261 void menubar_remove (const char *name);
1248 void menubar_dump (FILE *fp); 1262 void menubar_dump (FILE *fp);
1249 void menubar_read (const char *filename); 1263 void menubar_read (const char *filename);
1250 void menubar_dispatch (char *str); 1264 void menubar_dispatch (char *str);
1251 void draw_Arrows (int name, int state); 1265 void draw_Arrows (int name, int state);
1252 void menubar_expose (); 1266 void menubar_expose ();
1253 int menubar_mapping (int map); 1267 int menubar_mapping (int map);
1254 int menu_select (XButtonEvent *ev); 1268 int menu_select (XButtonEvent &ev);
1255 void menubar_select (XButtonEvent *ev); 1269 void menubar_select (XButtonEvent &ev);
1256 void menubar_control (XButtonEvent *ev); 1270 void menubar_control (XButtonEvent &ev);
1257 void map_menuBar (int map); 1271 void map_menuBar (int map);
1258#endif 1272#endif
1259 1273
1260 // screen.C 1274 // screen.C
1261 void scr_poweron (); 1275 void scr_poweron ();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines