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.236 by root, Sun Jan 22 17:10:01 2006 UTC vs.
Revision 1.264 by root, Sat Dec 2 16:57:16 2006 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
40#include "libptytty.h" 43#include "libptytty.h"
… …
96# define STDOUT_FILENO 1 99# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 100# define STDERR_FILENO 2
98#endif 101#endif
99 102
100/****************************************************************************/ 103/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 104
123// exception thrown on fatal (per-instance) errors 105// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 106class rxvt_failure_exception { };
125 107
126// exception thrown when the command parser runs out of input data 108// exception thrown when the command parser runs out of input data
… …
431// fake styles 413// fake styles
432#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
435 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
436// 5 custom bits for extensions 421// 5 custom bits for extensions
437#define RS_customCount 32 422#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 424#define RS_customShift 19
440 425
… …
509 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 497
513 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
514 500
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
534 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * on the unnecessary items, e.g. Color_pointer, but won't bother
535 * until we need to. Also, be aware of usage in pixcolor_set 521 * until we need to. Also, be aware of usage in pixcolor_set
536 */ 522 */
537 523
538enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
539 Color_fg = 0, 527 Color_fg = 0,
540 Color_bg, 528 Color_bg,
541 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
543 Color_Red3, 531 Color_Red3,
… …
603#endif 591#endif
604}; 592};
605 593
606#define Color_Bits 7 // 0 .. maxTermCOLOR 594#define Color_Bits 7 // 0 .. maxTermCOLOR
607 595
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610
611/* 596/*
612 * Resource list 597 * Resource list
613 */ 598 */
614enum { 599enum {
615# define def(name) Rs_ ## name, 600# define def(name) Rs_ ## name,
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 601# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 602# include "rsinc.h"
618# undef def 603# undef def
619# undef reserve 604# undef reserve
620 NUM_RESOURCES 605 NUM_RESOURCES
621};
622
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657}; 606};
658 607
659/* DEC private modes */ 608/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 683 *****************************************************************************
735 * MACRO DEFINES 684 * MACRO DEFINES
736 ***************************************************************************** 685 *****************************************************************************
737 */ 686 */
738#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
740 693
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 703
751#define OPTION(opt) (options & (opt)) 704#define OPTION(opt) (options & (opt))
752#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 705#define DEFAULT_OPTIONS (Opt_scrollBar \
753 | Opt_jumpScroll | Opt_secondaryScreen \ 706 | Opt_scrollTtyOutput \
754 | Opt_pastableTabs | Opt_intensityStyles) 707 | Opt_jumpScroll \
708 | Opt_secondaryScreen \
709 | Opt_secondaryScroll \
710 | Opt_pastableTabs \
711 | Opt_intensityStyles)
755 712
756// for m >= -n, ensure remainder lies between 0..n-1 713// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n)) 714#define MOD(m,n) (((m) + (n)) % (n))
758 715
759#define LINENO(n) MOD (term_start + int(n), total_rows) 716#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 735#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 736#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 737
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 738#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 739
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 740#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 741#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 742
786#if ENABLE_STYLES 743#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 744# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 745#else
789# define FONTSET(style) fontset[0] 746# define FONTSET(style) fontset[0]
… …
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 780# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else 781#else
825# define XPMClearArea(a, b, c, d, e, f, g) 782# define XPMClearArea(a, b, c, d, e, f, g)
826#endif 783#endif
827 784
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif
848
849typedef callback1<void, const char *> log_callback; 785typedef callback<void (const char *)> log_callback;
850typedef callback1<int, int> getfd_callback; 786typedef callback<int (int)> getfd_callback;
851 787
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 788#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale) NOTHROW; 789extern bool rxvt_set_locale (const char *locale) NOTHROW;
854extern void rxvt_push_locale (const char *locale) NOTHROW; 790extern void rxvt_push_locale (const char *locale) NOTHROW;
855extern void rxvt_pop_locale () NOTHROW; 791extern void rxvt_pop_locale () NOTHROW;
… …
857/****************************************************************************/ 793/****************************************************************************/
858 794
859#define LINE_LONGER 0x0001 // line is continued on the next row 795#define LINE_LONGER 0x0001 // line is continued on the next row
860#define LINE_FILTERED 0x0002 // line has been filtered 796#define LINE_FILTERED 0x0002 // line has been filtered
861#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 797#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
798#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
799#define LINE_BIDI 0x0010 // line needs bidi (NYI)
862 800
863struct line_t { 801struct line_t {
864 text_t *t; // terminal the text 802 text_t *t; // terminal the text
865 rend_t *r; // rendition, uses RS_ flags 803 rend_t *r; // rendition, uses RS_ flags
866 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 804 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
920# define COMPOSE_LO 0x40000000UL 858# define COMPOSE_LO 0x40000000UL
921# define COMPOSE_HI 0x400fffffUL 859# define COMPOSE_HI 0x400fffffUL
922# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 860# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
923#else 861#else
924# if ENABLE_PERL 862# if ENABLE_PERL
925# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 863# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
926# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 864# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
927# else 865# else
928# define COMPOSE_LO 0xd800UL 866# define COMPOSE_LO 0xd800UL
929# define COMPOSE_HI 0xf8ffUL 867# define COMPOSE_HI 0xf8ffUL
930# endif 868# endif
… …
959#endif 897#endif
960 898
961/****************************************************************************/ 899/****************************************************************************/
962 900
963#ifdef KEYSYM_RESOURCE 901#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 902class keyboard_manager;
965#endif 903#endif
966 904
967struct rxvt_term : zero_initialized, rxvt_vars { 905struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
906
907 // special markers with magic addresses
908 static const char resval_undef []; // options specifically unset
909 static const char resval_on []; // boolean options switched on
910 static const char resval_off []; // or off
911
968 log_callback *log_hook; // log error messages through this hook, if != 0 912 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 913 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 914#if ENABLE_PERL
971 rxvt_perl_term perl; 915 rxvt_perl_term perl;
972#endif 916#endif
973 struct mbstate mbstate; // current input multibyte state 917 struct mbstate mbstate; // current input multibyte state
… …
1012 int num_scr; /* screen: number lines scrolled */ 956 int num_scr; /* screen: number lines scrolled */
1013 int prev_ncol, /* screen: previous number of columns */ 957 int prev_ncol, /* screen: previous number of columns */
1014 prev_nrow; /* screen: previous number of rows */ 958 prev_nrow; /* screen: previous number of rows */
1015/* ---------- */ 959/* ---------- */
1016 rend_t rstyle; 960 rend_t rstyle;
1017/* ---------- */
1018 uint32_t pixcolor_set[NPIXCLR_SETS];
1019/* ---------- */ 961/* ---------- */
1020#ifdef SELECTION_SCROLLING 962#ifdef SELECTION_SCROLLING
1021 int scroll_selection_lines; 963 int scroll_selection_lines;
1022 enum page_dirn scroll_selection_dir; 964 enum page_dirn scroll_selection_dir;
1023 int selection_save_x, 965 int selection_save_x,
… …
1050 int old_width, /* last used width in screen resize */ 992 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 993 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 994 unsigned long priv_modes,
1053 SavedModes; 995 SavedModes;
1054/* ---------- */ 996/* ---------- */
1055 Atom xa[NUM_XA]; 997 Atom *xa;
1056/* ---------- */ 998/* ---------- */
1057#ifdef RXVT_SCROLLBAR 999#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 1000 GC scrollbarGC,
1059 topShadowGC, 1001 topShadowGC,
1060 botShadowGC; 1002 botShadowGC;
… …
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1059 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1060#endif
1119 1061
1120 vector<void *> allocated; // free these memory blocks with free() 1062 vector<void *> allocated; // free these memory blocks with free()
1121 1063
1122 char *env_windowid; /* environmental variable WINDOWID */ 1064 char env_windowid[21]; /* environmental variable WINDOWID */
1065 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1066 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1067 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1068
1126 char *locale; 1069 char *locale;
1127 char charsets[4]; 1070 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1071 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1072 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1073 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1074
1132#ifdef KEYSYM_RESOURCE 1075#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1076 keyboard_manager *keyboard;
1134#endif 1077#endif
1135 1078
… …
1157#endif 1100#endif
1158 1101
1159 // modifies first argument(!) 1102 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1103 void paste (char *data, unsigned int len) NOTHROW;
1161 1104
1162 long vt_emask, vt_emask_perl; 1105 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1106
1164 void vt_select_input () const NOTHROW 1107 void vt_select_input () const NOTHROW
1165 { 1108 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1109 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1110 }
1168 1111
1169#if TRANSPARENT 1112#if TRANSPARENT || ENABLE_PERL
1170 void rootwin_cb (XEvent &xev); 1113 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1114 xevent_watcher rootwin_ev;
1172#endif 1115#endif
1173 1116
1174 void x_cb (XEvent &xev); 1117 void x_cb (XEvent &xev);
… …
1236 bool pty_fill (); 1179 bool pty_fill ();
1237 1180
1238 void make_current () const // make this the "currently active" urxvt instance 1181 void make_current () const // make this the "currently active" urxvt instance
1239 { 1182 {
1240 SET_R (this); 1183 SET_R (this);
1184 set_environ (envv);
1241 rxvt_set_locale (locale); 1185 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 } 1186 }
1244 1187
1245 void init_secondary (); 1188 void init_secondary ();
1246 const char **init_resources (int argc, const char *const *argv); 1189 const char **init_resources (int argc, const char *const *argv);
1247 const char *x_resource (const char *name); 1190 const char *x_resource (const char *name);
… …
1272 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1215 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1273 1216
1274 bool IMisRunning (); 1217 bool IMisRunning ();
1275 void IMSendSpot (); 1218 void IMSendSpot ();
1276 bool IM_get_IC (const char *modifiers); 1219 bool IM_get_IC (const char *modifiers);
1277 void IMSetStatusPosition (); 1220 void IMSetPosition ();
1278#endif 1221#endif
1279 1222
1280 void resize_scrollbar (); 1223 void resize_scrollbar ();
1281 1224
1282 // command.C 1225 // command.C
1283 void lookup_key (XKeyEvent &ev); 1226 void key_press (XKeyEvent &ev);
1227 void key_release (XKeyEvent &ev);
1284 unsigned int cmd_write (const char *str, unsigned int count); 1228 unsigned int cmd_write (const char *str, unsigned int count);
1285 1229
1286 wchar_t next_char () NOTHROW; 1230 wchar_t next_char () NOTHROW;
1287 wchar_t cmd_getc () THROW ((class out_of_input)); 1231 wchar_t cmd_getc () THROW ((class out_of_input));
1288 uint32_t next_octet () NOTHROW; 1232 uint32_t next_octet () NOTHROW;
… …
1292 void mouse_report (XButtonEvent &ev); 1236 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1237 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1238 void button_release (XButtonEvent &ev);
1295 void focus_in (); 1239 void focus_in ();
1296 void focus_out (); 1240 void focus_out ();
1241 void update_fade_color (unsigned int idx);
1297 int check_our_parents (); 1242 int check_our_parents ();
1298#ifdef PRINTPIPE 1243#ifdef PRINTPIPE
1299 FILE *popen_printer (); 1244 FILE *popen_printer ();
1300 int pclose_printer (FILE *stream); 1245 int pclose_printer (FILE *stream);
1301#endif 1246#endif
… …
1323 void set_utf8_property (Atom prop, const char *str, int len = -1); 1268 void set_utf8_property (Atom prop, const char *str, int len = -1);
1324 void set_title (const char *str); 1269 void set_title (const char *str);
1325 void set_icon_name (const char *str); 1270 void set_icon_name (const char *str);
1326 void set_window_color (int idx, const char *color); 1271 void set_window_color (int idx, const char *color);
1327 void set_colorfgbg (); 1272 void set_colorfgbg ();
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1273 bool set_color (rxvt_color &color, const char *name);
1274 void alias_color (int dst, int src);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1275 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1276
1331 // screen.C 1277 // screen.C
1332 1278
1333 void lalloc (line_t &l) const NOTHROW 1279 void lalloc (line_t &l) const
1334 { 1280 {
1335 l.t = (text_t *)talloc->alloc (); 1281 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1282 l.r = (rend_t *)ralloc->alloc ();
1337 } 1283 }
1338 1284
… …
1342 talloc->free (l.t); 1288 talloc->free (l.t);
1343 ralloc->free (l.r); 1289 ralloc->free (l.r);
1344 } 1290 }
1345#endif 1291#endif
1346 1292
1347 void lresize (line_t &l) const NOTHROW 1293 void lresize (line_t &l) const
1348 { 1294 {
1349 if (!l.t) 1295 if (!l.t)
1350 return; 1296 return;
1351 1297
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1298 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1420 void scr_remap_chars () NOTHROW; 1366 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1367 void scr_remap_chars (line_t &l) NOTHROW;
1422 1368
1423 enum cursor_mode { SAVE, RESTORE }; 1369 enum cursor_mode { SAVE, RESTORE };
1424 1370
1425 void scr_poweron () NOTHROW; 1371 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1372 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1373 void scr_do_wrap () NOTHROW;
1374 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1375 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1376 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1377 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1378 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1379 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1380 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1525# define __PROTO(p) p 1472# define __PROTO(p) p
1526#else 1473#else
1527# define __PROTO(p) () 1474# define __PROTO(p) ()
1528#endif 1475#endif
1529 1476
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1477#endif /* _RXVT_H_ */
1535 1478

Diff Legend

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