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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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