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.102 by root, Tue Aug 17 02:18:38 2004 UTC vs.
Revision 1.128 by root, Sat Dec 11 23:01:36 2004 UTC

… …
86RETSIGTYPE rxvt_Exit_signal (int sig); 86RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 87void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 88void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 89void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 90void * rxvt_realloc (void *ptr, size_t size);
91char * rxvt_wcstombs (const wchar_t *str, int len); 91char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 95char * rxvt_strdup (const char *str);
93char * rxvt_r_basename (const char *str); 96char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 97void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 98void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 99void rxvt_warn (const char *fmt,...);
… …
99int rxvt_Str_match (const char *s1, const char *s2); 102int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str); 103const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str); 104char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str); 105int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs); 106char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs);
104char * rxvt_File_find (const char *file, const char *ext, const char *path); 108char * rxvt_File_find (const char *file, const char *ext, const char *path);
105void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 109void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
106void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 110void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
107 111
108void rxvt_privileges (rxvt_privaction action); 112void rxvt_privileges (rxvt_privaction action);
… …
123#endif 127#endif
124 128
125/* If we're using either the rxvt scrollbar or menu bars, keep the 129/* If we're using either the rxvt scrollbar or menu bars, keep the
126 * scrollColor resource. 130 * scrollColor resource.
127 */ 131 */
128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
129# define KEEP_SCROLLCOLOR 1 133# define KEEP_SCROLLCOLOR 1
130#else 134#else
131# undef KEEP_SCROLLCOLOR 135# undef KEEP_SCROLLCOLOR
132#endif 136#endif
133 137
134#ifdef XPM_BACKGROUND 138#ifdef XPM_BACKGROUND
135typedef struct { 139typedef struct {
136 short w, h, x, y; 140 short w, h, x, y;
137 Pixmap pixmap; 141 Pixmap pixmap;
138} bgPixmap_t; 142} bgPixmap_t;
139#endif 143#endif
140 144
141/* 145/*
142 * the 'essential' information for reporting Mouse Events 146 * the 'essential' information for reporting Mouse Events
143 * pared down from XButtonEvent 147 * pared down from XButtonEvent
144 */ 148 */
145struct mouse_event { 149struct mouse_event {
146 int clicks; 150 int clicks;
147 Time time; /* milliseconds */ 151 Time time; /* milliseconds */
148 unsigned int state; /* key or button mask */ 152 unsigned int state; /* key or button mask */
149 unsigned int button; /* detail */ 153 unsigned int button; /* detail */
150}; 154};
151 155
152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 156#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 157#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
154#define SWAP_IT(one, two, typeof) \ 158#define SWAP_IT(one, two, typeof) \
… …
183# define COLORTERMENVFULL COLORTERMENV "-xpm" 187# define COLORTERMENVFULL COLORTERMENV "-xpm"
184#else 188#else
185# define COLORTERMENVFULL COLORTERMENV 189# define COLORTERMENVFULL COLORTERMENV
186#endif 190#endif
187#ifndef TERMENV 191#ifndef TERMENV
188# define TERMENV "rxvt" 192# define TERMENV "rxvt-unicode"
189#endif 193#endif
190 194
191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 195#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
192# define NO_MOUSE_REPORT_SCROLLBAR 1 196# define NO_MOUSE_REPORT_SCROLLBAR 1
193#endif 197#endif
… …
350 SECONDARY, 354 SECONDARY,
351}; 355};
352 356
353#define RS_None 0 /* Normal */ 357#define RS_None 0 /* Normal */
354 358
355#define RS_fgMask 0x000001FFUL /* 512 colors */ 359#define RS_fgMask 0x0000007fUL /* 128 colors */
356#define RS_bgMask 0x0003FE00UL /* 512 colors */ 360#define RS_bgMask 0x00003f80UL /* 128 colors */
361
362// font styles
357#define RS_Bold 0x00040000UL /* bold */ 363#define RS_Bold 0x00004000UL // value 1
358#define RS_Italic 0x00080000UL 364#define RS_Italic 0x00008000UL // value 2
365
366// fake styles
359#define RS_Blink 0x00100000UL /* blink */ 367#define RS_Blink 0x00010000UL /* blink */
360#define RS_RVid 0x00200000UL /* reverse video */ 368#define RS_RVid 0x00020000UL /* reverse video */
361#define RS_Uline 0x00400000UL /* underline */ 369#define RS_Uline 0x00040000UL /* underline */
362 370
371// 5 bits still to go
372
373// other flags
374#define RS_Careful 0x80000000UL /* be careful when drawing these */
375
363#define RS_fontCount 512 376#define RS_styleCount 4
364#define RS_fontMask 0xff800000UL /* plenty(?) of fonts */ 377#define RS_styleMask (RS_Bold | RS_Italic)
365#define RS_fontShift 23 378#define RS_styleShift 14
366 379
367#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 380#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
368#define RS_attrMask (RS_baseattrMask|RS_fontMask) 381#define RS_attrMask (RS_baseattrMask | RS_fontMask)
382
383#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
384#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
385#define RS_fontShift 24
386
387#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
388#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
369 389
370#define Sel_none 0 /* Not waiting */ 390#define Sel_none 0 /* Not waiting */
371#define Sel_normal 0x01 /* normal selection */ 391#define Sel_normal 0x01 /* normal selection */
372#define Sel_incr 0x02 /* incremental selection */ 392#define Sel_incr 0x02 /* incremental selection */
373#define Sel_direct 0x00 393#define Sel_direct 0x00
… …
419 XTerm_Pixmap = 20, // new bg pixmap 439 XTerm_Pixmap = 20, // new bg pixmap
420 XTerm_restoreFG = 39, // change default fg color 440 XTerm_restoreFG = 39, // change default fg color
421 XTerm_restoreBG = 49, // change default bg color 441 XTerm_restoreBG = 49, // change default bg color
422 XTerm_dumpscreen = 55, // dump scrollback and all of screen 442 XTerm_dumpscreen = 55, // dump scrollback and all of screen
423 XTerm_locale = 701, // change locale 443 XTerm_locale = 701, // change locale
424 XTerm_findfont = 702, // find font of given character (in decimal)
425 XTerm_Menu = 703, // set menu item 444 XTerm_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour
447
448 URxvt_font = 710,
449 URxvt_boldFont = 711,
450 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713,
426}; 452};
427 453
428/* Words starting with `Color_' are colours. Others are counts */ 454/* Words starting with `Color_' are colours. Others are counts */
429/* 455/*
430 * The following comment is mostly obsolete since pixcolor_set was expanded: 456 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
459 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 485 maxBrightCOLOR, /* minBrightCOLOR + 7 */
460 Color_White = maxBrightCOLOR, 486 Color_White = maxBrightCOLOR,
461#else 487#else
462 Color_White = maxCOLOR, 488 Color_White = maxCOLOR,
463#endif 489#endif
464#ifdef TTY_256COLOR
465 min256COLOR = Color_White + 1, 490 minTermCOLOR = Color_White + 1,
466 max256COLOR = minCOLOR + 255, 491 maxTermCOLOR = Color_White + 72,
467#endif
468#ifndef NO_CURSORCOLOR 492#ifndef NO_CURSORCOLOR
469 Color_cursor, 493 Color_cursor,
470 Color_cursor2, 494 Color_cursor2,
471#endif 495#endif
472 Color_pointer_fg, 496 Color_pointer_fg,
473 Color_pointer_bg, 497 Color_pointer_bg,
474 Color_border, 498 Color_border,
475#ifndef NO_BOLD_UNDERLINE_REVERSE 499#ifndef NO_BOLD_UNDERLINE_REVERSE
476 Color_BD, 500 Color_BD,
501 Color_IT,
477 Color_UL, 502 Color_UL,
478 Color_RV, 503 Color_RV,
479#endif 504#endif
480#ifdef OPTION_HC 505#ifdef OPTION_HC
481 Color_HC, 506 Color_HC,
… …
489#endif 514#endif
490 NRS_COLORS, /* */ 515 NRS_COLORS, /* */
491#ifdef KEEP_SCROLLCOLOR 516#ifdef KEEP_SCROLLCOLOR
492 Color_topShadow = NRS_COLORS, 517 Color_topShadow = NRS_COLORS,
493 Color_bottomShadow, 518 Color_bottomShadow,
494 TOTAL_COLORS /* upto 30 */ 519 TOTAL_COLORS
495#else 520#else
496 TOTAL_COLORS = NRS_COLORS /* */ 521 TOTAL_COLORS = NRS_COLORS
497#endif 522#endif
498}; 523};
499 524
500#define Color_Bits 9 525#define Color_Bits 7 // 0 .. maxTermCOLOR
526
501#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 527#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
502#define NPIXCLR_BITS 32 528#define NPIXCLR_BITS 32
503
504#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
505 529
506/* 530/*
507 * Resource list 531 * Resource list
508 */ 532 */
509enum { 533enum {
… …
513 Rs_geometry, 537 Rs_geometry,
514 Rs_reverseVideo, 538 Rs_reverseVideo,
515 Rs_color, 539 Rs_color,
516 _Rs_color = Rs_color + NRS_COLORS - 1, 540 _Rs_color = Rs_color + NRS_COLORS - 1,
517 Rs_font, 541 Rs_font,
542#if ENABLE_STYLES
543 Rs_boldFont,
544 Rs_italicFont,
545 Rs_boldItalicFont,
546#endif
518 Rs_name, 547 Rs_name,
519 Rs_title, 548 Rs_title,
520#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 549#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
521 Rs_path, 550 Rs_path,
522#endif 551#endif
… …
584 Rs_insecure, 613 Rs_insecure,
585 Rs_cursorBlink, 614 Rs_cursorBlink,
586 Rs_pointerBlank, 615 Rs_pointerBlank,
587 Rs_pointerBlankDelay, 616 Rs_pointerBlankDelay,
588 Rs_imLocale, 617 Rs_imLocale,
618 Rs_pastableTabs,
589#ifndef NO_SECONDARY_SCREEN 619#ifndef NO_SECONDARY_SCREEN
590 Rs_secondaryScreen, 620 Rs_secondaryScreen,
591 Rs_secondaryScroll, 621 Rs_secondaryScroll,
592#endif
593#ifndef NO_BOLD_UNDERLINE_REVERSE
594 Rs_realBold,
595#endif 622#endif
596#ifdef OFF_FOCUS_FADING 623#ifdef OFF_FOCUS_FADING
597 Rs_fade, 624 Rs_fade,
598#endif 625#endif
599#ifdef TINTING 626#ifdef TINTING
… …
754# define GET_FGCOLOR(x) GET_BASEFG(x) 781# define GET_FGCOLOR(x) GET_BASEFG(x)
755# define GET_BGCOLOR(x) GET_BASEBG(x) 782# define GET_BGCOLOR(x) GET_BASEBG(x)
756#endif 783#endif
757 784
758#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 785#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
759#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 786#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
787
788#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
789#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
760 790
761#define GET_ATTR(x) (((x) & RS_attrMask)) 791#define GET_ATTR(x) (((x) & RS_attrMask))
762#define GET_BGATTR(x) \ 792#define GET_BGATTR(x) \
763 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 793 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
764 | (((x) & RS_fgMask)<<Color_Bits)) \ 794 | (((x) & RS_fgMask)<<Color_Bits)) \
765 : ((x) & (RS_attrMask | RS_bgMask))) 795 : ((x) & (RS_attrMask | RS_bgMask)))
766#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 796#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
767#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 797#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
768#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 798#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
799
800#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
769 801
770#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 802#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
771#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 803#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
804
805#if ENABLE_STYLES
806# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
807#else
808# define FONTSET(style) TermWin.fontset[0]
809#endif
772 810
773#ifdef HAVE_SCROLLBARS 811#ifdef HAVE_SCROLLBARS
774# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 812# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
775#else 813#else
776# define scrollbar_TotalWidth() (0) 814# define scrollbar_TotalWidth() (0)
… …
942 980
943extern class rxvt_composite_vec rxvt_composite; 981extern class rxvt_composite_vec rxvt_composite;
944#endif 982#endif
945 983
946 984
947struct rxvt_term : rxvt_vars { 985struct rxvt_term : zero_initialized, rxvt_vars {
948 log_callback *log_hook; // log error messages through this hook, if != 0 986 log_callback *log_hook; // log error messages through this hook, if != 0
949 987
950 struct mbstate mbstate; // current input multibyte state 988 struct mbstate mbstate; // current input multibyte state
951 989
952 unsigned char want_refresh:1, 990 unsigned char want_refresh:1,
… …
968 hidden_text:1, 1006 hidden_text:1,
969#endif 1007#endif
970#ifdef POINTER_BLANK 1008#ifdef POINTER_BLANK
971 hidden_pointer:1, 1009 hidden_pointer:1,
972#endif 1010#endif
973// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1011// enc_utf8:1, /* wether locale uses utf-8 */
974 seen_input:1, /* wether we have seen some program output yet */ 1012 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */
975 parsed_geometry:1; 1014 parsed_geometry:1;
976 1015
977 unsigned char refresh_type, 1016 unsigned char refresh_type,
978#ifdef META8_OPTION 1017#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 1018 meta_char, /* Alt-key prefix */
… …
981 scrollbar_align, 1020 scrollbar_align,
982 selection_wait, 1021 selection_wait,
983 selection_type; 1022 selection_type;
984/* ---------- */ 1023/* ---------- */
985 short rvideo; 1024 short rvideo;
986 int16_t num_scr; /* screen: number lines scrolled */ 1025 int num_scr; /* screen: number lines scrolled */
987 unsigned int prev_ncol, /* screen: previous number of columns */ 1026 int prev_ncol, /* screen: previous number of columns */
988 prev_nrow; /* screen: previous number of rows */ 1027 prev_nrow; /* screen: previous number of rows */
989/* ---------- */ 1028/* ---------- */
990 rend_t rstyle; 1029 rend_t rstyle;
991/* ---------- */ 1030/* ---------- */
992 uint32_t pixcolor_set[NPIXCLR_SETS]; 1031 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
1024 pointerBlankDelay, 1063 pointerBlankDelay,
1025# endif 1064# endif
1026 allowedxerror; 1065 allowedxerror;
1027/* ---------- */ 1066/* ---------- */
1028 unsigned int ModMetaMask, 1067 unsigned int ModMetaMask,
1029 ModNumLockMask, 1068 ModNumLockMask;
1030#ifndef NO_BRIGHTCOLOR
1031 colorfgbg,
1032#endif
1033 old_width, /* last used width in screen resize */ 1069 int old_width, /* last used width in screen resize */
1034 old_height; /* last used height in screen resize */ 1070 old_height; /* last used height in screen resize */
1035 unsigned long priv_modes, 1071 unsigned long priv_modes,
1036 SavedModes; 1072 SavedModes;
1037/* ---------- */ 1073/* ---------- */
1038 Atom xa[NUM_XA]; 1074 Atom xa[NUM_XA];
… …
1077#ifndef NO_BACKSPACE_KEY 1113#ifndef NO_BACKSPACE_KEY
1078 const char *key_backspace; 1114 const char *key_backspace;
1079#endif 1115#endif
1080#ifndef NO_DELETE_KEY 1116#ifndef NO_DELETE_KEY
1081 const char *key_delete; 1117 const char *key_delete;
1082#endif
1083#ifdef USE_XIM
1084 rxvt_xim *input_method;
1085 XIC Input_Context;
1086 XIMStyle input_style;
1087#endif 1118#endif
1088 struct mouse_event MEvent; 1119 struct mouse_event MEvent;
1089 XComposeStatus compose; 1120 XComposeStatus compose;
1090 ttymode_t tio; 1121 ttymode_t tio;
1091#ifdef UTMP_SUPPORT 1122#ifdef UTMP_SUPPORT
… …
1128 void scr_swap_overlay (); 1159 void scr_swap_overlay ();
1129 void scr_overlay_new (int x, int y, int w, int h); 1160 void scr_overlay_new (int x, int y, int w, int h);
1130 void scr_overlay_off (); 1161 void scr_overlay_off ();
1131 void scr_overlay_set (int x, int y, 1162 void scr_overlay_set (int x, int y,
1132 text_t text, 1163 text_t text,
1133 rend_t rend = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg)); 1164 rend_t rend = OVERLAY_RSTYLE);
1134 void scr_overlay_set (int x, int y, const char *s); 1165 void scr_overlay_set (int x, int y, const char *s);
1135#endif 1166#endif
1136 1167
1137 vector<void *> allocated; // free these memory blocks with free() 1168 vector<void *> allocated; // free these memory blocks with free()
1138 1169
1139 char *env_windowid; /* environmental variable WINDOWID */ 1170 char *env_windowid; /* environmental variable WINDOWID */
1140 char *env_display; /* environmental variable DISPLAY */ 1171 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1172 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1173 char *env_colorfgbg;
1143 char *locale; 1174 char *locale;
1144#if 0
1145 char *codeset;
1146#endif
1147 char charsets[4]; 1175 char charsets[4];
1148 unsigned char *v_buffer; /* pointer to physical buffer */ 1176 unsigned char *v_buffer; /* pointer to physical buffer */
1149 unsigned int v_buflen; /* size of area to write */ 1177 unsigned int v_buflen; /* size of area to write */
1150 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1178 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1151#ifdef KEYSYM_RESOURCE 1179#ifdef KEYSYM_RESOURCE
… …
1165 // ISO 14755 entry support 1193 // ISO 14755 entry support
1166 unicode_t iso14755buf; 1194 unicode_t iso14755buf;
1167 void commit_iso14755 (); 1195 void commit_iso14755 ();
1168 int hex_keyval (XKeyEvent &ev); 1196 int hex_keyval (XKeyEvent &ev);
1169# if ISO_14755 1197# if ISO_14755
1170 void iso14755_51 (wchar_t ch); 1198 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1171 void iso14755_54 (int x, int y); 1199 void iso14755_54 (int x, int y);
1172# endif 1200# endif
1173#endif 1201#endif
1174 1202
1175 void paste (const unsigned char *data, unsigned int len); 1203 void paste (const unsigned char *data, unsigned int len);
… …
1178 1206
1179#if TRANSPARENT 1207#if TRANSPARENT
1180 void rootwin_cb (XEvent &xev); 1208 void rootwin_cb (XEvent &xev);
1181 xevent_watcher rootwin_ev; 1209 xevent_watcher rootwin_ev;
1182#endif 1210#endif
1211
1212
1213 void sig_term (sig_watcher &w); sig_watcher sw_term;
1214 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1183 1215
1184 void x_cb (XEvent &xev); 1216 void x_cb (XEvent &xev);
1185 xevent_watcher termwin_ev; 1217 xevent_watcher termwin_ev;
1186 xevent_watcher vt_ev; 1218 xevent_watcher vt_ev;
1187#ifdef HAVE_SCROLLBARS 1219#ifdef HAVE_SCROLLBARS
… …
1233 1265
1234 bool init (int argc, const char *const *argv); 1266 bool init (int argc, const char *const *argv);
1235 bool init_vars (); 1267 bool init_vars ();
1236 1268
1237 bool pty_fill (); 1269 bool pty_fill ();
1238
1239 void *operator new (size_t s);
1240 void operator delete (void *p, size_t s);
1241 1270
1242 void init_secondary (); 1271 void init_secondary ();
1243 const char **init_resources (int argc, const char *const *argv); 1272 const char **init_resources (int argc, const char *const *argv);
1244 void init_env (); 1273 void init_env ();
1245 void set_locale (const char *locale); 1274 void set_locale (const char *locale);
1246 void init_xlocale (); 1275 void init_xlocale ();
1247 void init_command (const char *const *argv); 1276 void init_command (const char *const *argv);
1248 void run_command (const char *const *argv); 1277 void run_command (const char *const *argv);
1249 int run_child (const char *const *argv); 1278 int run_child (const char *const *argv);
1250 static void child_exited (int pid);
1251 1279
1252 void color_aliases (int idx); 1280 void color_aliases (int idx);
1253 void recolour_cursor (); 1281 void recolour_cursor ();
1254 void create_windows (int argc, const char *const *argv); 1282 void create_windows (int argc, const char *const *argv);
1255 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1283 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1256 void window_calc (unsigned int width, unsigned int height); 1284 void window_calc (unsigned int width, unsigned int height);
1257 1285
1258#if USE_XIM 1286#if USE_XIM
1287 rxvt_xim *input_method;
1288 XIC Input_Context;
1289 XIMStyle input_style;
1290 XPoint spot; // most recently sent spot position
1291
1259 void im_destroy (); 1292 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1293 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1294 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos); 1295 void im_set_position (XPoint &pos);
1263 void im_set_color (unsigned long &fg, unsigned long &bg); 1296 void im_set_color (unsigned long &fg, unsigned long &bg);
… …
1318 // logging.C 1351 // logging.C
1319 void makeutent (const char *pty, const char *hostname); 1352 void makeutent (const char *pty, const char *hostname);
1320 void cleanutent (); 1353 void cleanutent ();
1321 // main.C 1354 // main.C
1322 void privileged_utmp (rxvt_privaction action); 1355 void privileged_utmp (rxvt_privaction action);
1323 bool change_font (const char *fontname); 1356 bool set_fonts ();
1324 bool font_up_down (int n, int direction); 1357 void set_string_property (Atom prop, const char *str, int len = -1);
1358 void set_utf8_property (Atom prop, const char *str, int len = -1);
1325 void set_title (const char *str); 1359 void set_title (const char *str);
1326 void set_icon_name (const char *str); 1360 void set_icon_name (const char *str);
1327 void set_window_color (int idx, const char *color); 1361 void set_window_color (int idx, const char *color);
1328 void set_colorfgbg (); 1362 void set_colorfgbg ();
1329 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1363 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1373 void scr_refresh (unsigned char refresh_type); 1407 void scr_refresh (unsigned char refresh_type);
1374 bool scr_refresh_rend (rend_t mask, rend_t value); 1408 bool scr_refresh_rend (rend_t mask, rend_t value);
1375 void scr_erase_screen (int mode); 1409 void scr_erase_screen (int mode);
1376 void scr_touch (bool refresh); 1410 void scr_touch (bool refresh);
1377 void scr_expose (int x, int y, int width, int height, bool refresh); 1411 void scr_expose (int x, int y, int width, int height, bool refresh);
1412 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1413 void scr_recolour ();
1378 void scr_remap_chars (); 1414 void scr_remap_chars ();
1379 void scr_remap_chars (text_t *tp, rend_t *rp); 1415 void scr_remap_chars (text_t *tp, rend_t *rp);
1380 1416
1381 void scr_poweron (); 1417 void scr_poweron ();
1382 void scr_cursor (int mode); 1418 void scr_cursor (int mode);
… …
1384 int scr_change_screen (int scrn); 1420 int scr_change_screen (int scrn);
1385 void scr_color (unsigned int color, int fgbg); 1421 void scr_color (unsigned int color, int fgbg);
1386 void scr_rendition (int set, int style); 1422 void scr_rendition (int set, int style);
1387 void scr_add_lines (const unicode_t *str, int nlines, int len); 1423 void scr_add_lines (const unicode_t *str, int nlines, int len);
1388 void scr_backspace (); 1424 void scr_backspace ();
1389 void scr_tab (int count); 1425 void scr_tab (int count, bool ht = false);
1390 void scr_backindex (); 1426 void scr_backindex ();
1391 void scr_forwardindex (); 1427 void scr_forwardindex ();
1392 void scr_gotorc (int row, int col, int relative); 1428 void scr_gotorc (int row, int col, int relative);
1393 void scr_index (enum page_dirn direction); 1429 void scr_index (enum page_dirn direction);
1394 void scr_erase_line (int mode); 1430 void scr_erase_line (int mode);
… …
1406 void set_font_style (); 1442 void set_font_style ();
1407 void scr_charset_choose (int set); 1443 void scr_charset_choose (int set);
1408 void scr_charset_set (int set, unsigned int ch); 1444 void scr_charset_set (int set, unsigned int ch);
1409 int scr_move_to (int y, int len); 1445 int scr_move_to (int y, int len);
1410 int scr_page (enum page_dirn direction, int nlines); 1446 int scr_page (enum page_dirn direction, int nlines);
1411 int scr_changeview (uint16_t oldviewstart); 1447 int scr_changeview (unsigned int oldviewstart);
1412 void scr_bell (); 1448 void scr_bell ();
1413 void scr_printscreen (int fullhist); 1449 void scr_printscreen (int fullhist);
1414 void scr_reverse_selection (); 1450 void scr_reverse_selection ();
1415 void scr_dump (int fd); 1451 void scr_dump (int fd);
1416 void selection_check (int check_more); 1452 void selection_check (int check_more);

Diff Legend

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