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.234 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.261 by root, Sat Jul 29 21:44:44 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"
… …
97# define STDERR_FILENO 2 100# define STDERR_FILENO 2
98#endif 101#endif
99 102
100/****************************************************************************/ 103/****************************************************************************/
101 104
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
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
127class out_of_input { }; 109class out_of_input { };
… …
169extern char **environ; 151extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
171 153
172inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
173{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
174 if (envv) 159 if (envv)
160#endif
175 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
176} 162}
177 163
178inline void set_environ (char **envv) 164inline void set_environ (char **envv)
179{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
180 if (envv) 169 if (envv)
170#endif
181 environ = envv; 171 environ = envv;
182} 172}
183 173
184/* 174/*
185 ***************************************************************************** 175 *****************************************************************************
… …
423// fake styles 413// fake styles
424#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
425#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
426#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
427 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
428// 5 custom bits for extensions 421// 5 custom bits for extensions
429#define RS_customCount 32 422#define RS_customCount 32
430#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
431#define RS_customShift 19 424#define RS_customShift 19
432 425
… …
501 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
502 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
503 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
504 497
505 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
506 500
507 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
508 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
509 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
510 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
595#endif 589#endif
596}; 590};
597 591
598#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
599 593
600#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
601#define NPIXCLR_BITS 32
602
603/* 594/*
604 * Resource list 595 * Resource list
605 */ 596 */
606enum { 597enum {
607# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
608# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 599# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
609# include "rsinc.h" 600# include "rsinc.h"
610# undef def 601# undef def
611# undef reserve 602# undef reserve
612 NUM_RESOURCES 603 NUM_RESOURCES
613};
614
615// see init.C:xa_names, which must be kept in sync
616enum {
617 XA_TEXT = 0,
618 XA_COMPOUND_TEXT,
619 XA_UTF8_STRING,
620 XA_MULTIPLE,
621 XA_TARGETS,
622 XA_TIMESTAMP,
623 XA_VT_SELECTION,
624 XA_INCR,
625 XA_WM_PROTOCOLS,
626 XA_WM_DELETE_WINDOW,
627 XA_CLIPBOARD,
628#if ENABLE_FRILLS
629 XA_MOTIF_WM_HINTS,
630#endif
631#if ENABLE_EWMH
632 XA_NET_WM_PID,
633 XA_NET_WM_NAME,
634 XA_NET_WM_ICON_NAME,
635 XA_NET_WM_PING,
636#endif
637#if USE_XIM
638 XA_WM_LOCALE_NAME,
639#endif
640#if TRANSPARENT
641 XA_XROOTPMAP_ID,
642 XA_ESETROOT_PMAP_ID,
643#endif
644#if ENABLE_XEMBED
645 XA_XEMBED,
646 XA_XEMBED_INFO,
647#endif
648 NUM_XA
649}; 604};
650 605
651/* DEC private modes */ 606/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 607#define PrivMode_132 (1UL<<0)
653#define PrivMode_132OK (1UL<<1) 608#define PrivMode_132OK (1UL<<1)
… …
726 ***************************************************************************** 681 *****************************************************************************
727 * MACRO DEFINES 682 * MACRO DEFINES
728 ***************************************************************************** 683 *****************************************************************************
729 */ 684 */
730#define dLocal(type,name) type const name = this->name 685#define dLocal(type,name) type const name = this->name
731#define dDisp Display *disp = this->display->display 686
687// for speed reasons, we assume that all latin1 characters
688// are single-width (the first unicode combining character
689// is actually 0x300, but ascii is what matters most).
690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
732 691
733/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
734#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
735#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
770#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
771#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
772 731
773#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
774 733
775#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
776#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
777 736
778#if ENABLE_STYLES 737#if ENABLE_STYLES
779# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
780#else 739#else
781# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 774# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
816#else 775#else
817# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
818#endif 777#endif
819 778
820#ifdef DEBUG_CMD
821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
822#else
823# define D_CMD(x)
824#endif
825#ifdef DEBUG_INIT
826# define D_INIT(x) fprintf x ; fputc('\n', stderr)
827#else
828# define D_INIT(x)
829#endif
830#ifdef DEBUG_MAIN
831# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
832#else
833# define D_MAIN(x)
834#endif
835#ifdef DEBUG_SIZE
836# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
837#else
838# define D_SIZE(x)
839#endif
840
841typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
842typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
843 781
844#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
845extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
846extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
847extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
912# define COMPOSE_LO 0x40000000UL 850# define COMPOSE_LO 0x40000000UL
913# define COMPOSE_HI 0x400fffffUL 851# define COMPOSE_HI 0x400fffffUL
914# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 852# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
915#else 853#else
916# if ENABLE_PERL 854# if ENABLE_PERL
917# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 855# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
918# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 856# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
919# else 857# else
920# define COMPOSE_LO 0xd800UL 858# define COMPOSE_LO 0xd800UL
921# define COMPOSE_HI 0xf8ffUL 859# define COMPOSE_HI 0xf8ffUL
922# endif 860# endif
… …
951#endif 889#endif
952 890
953/****************************************************************************/ 891/****************************************************************************/
954 892
955#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
956 class keyboard_manager; 894class keyboard_manager;
957#endif 895#endif
958 896
959struct rxvt_term : zero_initialized, rxvt_vars { 897struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
898
899 // special markers with magic addresses
900 static const char resval_undef []; // options specifically unset
901 static const char resval_on []; // boolean options switched on
902 static const char resval_off []; // or off
903
960 log_callback *log_hook; // log error messages through this hook, if != 0 904 log_callback *log_hook; // log error messages through this hook, if != 0
961 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
962#if ENABLE_PERL 906#if ENABLE_PERL
963 rxvt_perl_term perl; 907 rxvt_perl_term perl;
964#endif 908#endif
965 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
1004 int num_scr; /* screen: number lines scrolled */ 948 int num_scr; /* screen: number lines scrolled */
1005 int prev_ncol, /* screen: previous number of columns */ 949 int prev_ncol, /* screen: previous number of columns */
1006 prev_nrow; /* screen: previous number of rows */ 950 prev_nrow; /* screen: previous number of rows */
1007/* ---------- */ 951/* ---------- */
1008 rend_t rstyle; 952 rend_t rstyle;
1009/* ---------- */
1010 uint32_t pixcolor_set[NPIXCLR_SETS];
1011/* ---------- */ 953/* ---------- */
1012#ifdef SELECTION_SCROLLING 954#ifdef SELECTION_SCROLLING
1013 int scroll_selection_lines; 955 int scroll_selection_lines;
1014 enum page_dirn scroll_selection_dir; 956 enum page_dirn scroll_selection_dir;
1015 int selection_save_x, 957 int selection_save_x,
… …
1042 int old_width, /* last used width in screen resize */ 984 int old_width, /* last used width in screen resize */
1043 old_height; /* last used height in screen resize */ 985 old_height; /* last used height in screen resize */
1044 unsigned long priv_modes, 986 unsigned long priv_modes,
1045 SavedModes; 987 SavedModes;
1046/* ---------- */ 988/* ---------- */
1047 Atom xa[NUM_XA]; 989 Atom *xa;
1048/* ---------- */ 990/* ---------- */
1049#ifdef RXVT_SCROLLBAR 991#ifdef RXVT_SCROLLBAR
1050 GC scrollbarGC, 992 GC scrollbarGC,
1051 topShadowGC, 993 topShadowGC,
1052 botShadowGC; 994 botShadowGC;
… …
1109 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1051 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1110#endif 1052#endif
1111 1053
1112 vector<void *> allocated; // free these memory blocks with free() 1054 vector<void *> allocated; // free these memory blocks with free()
1113 1055
1114 char *env_windowid; /* environmental variable WINDOWID */ 1056 char env_windowid[21]; /* environmental variable WINDOWID */
1057 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1115 char *env_display; /* environmental variable DISPLAY */ 1058 char *env_display; /* environmental variable DISPLAY */
1116 char *env_term; /* environmental variable TERM */ 1059 char *env_term; /* environmental variable TERM */
1117 char *env_colorfgbg; 1060
1118 char *locale; 1061 char *locale;
1119 char charsets[4]; 1062 char charsets[4];
1120 char *v_buffer; /* pointer to physical buffer */ 1063 char *v_buffer; /* pointer to physical buffer */
1121 unsigned int v_buflen; /* size of area to write */ 1064 unsigned int v_buflen; /* size of area to write */
1122 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1065 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1123 1066
1124#ifdef KEYSYM_RESOURCE 1067#ifdef KEYSYM_RESOURCE
1125 keyboard_manager *keyboard; 1068 keyboard_manager *keyboard;
1126#endif 1069#endif
1127 1070
… …
1149#endif 1092#endif
1150 1093
1151 // modifies first argument(!) 1094 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1095 void paste (char *data, unsigned int len) NOTHROW;
1153 1096
1154 long vt_emask, vt_emask_perl; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1098
1156 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1157 { 1100 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1102 }
1160 1103
1161#if TRANSPARENT 1104#if TRANSPARENT || ENABLE_PERL
1162 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
1164#endif 1107#endif
1165 1108
1166 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
… …
1228 bool pty_fill (); 1171 bool pty_fill ();
1229 1172
1230 void make_current () const // make this the "currently active" urxvt instance 1173 void make_current () const // make this the "currently active" urxvt instance
1231 { 1174 {
1232 SET_R (this); 1175 SET_R (this);
1176 set_environ (envv);
1233 rxvt_set_locale (locale); 1177 rxvt_set_locale (locale);
1234 set_environ (envv);
1235 } 1178 }
1236 1179
1237 void init_secondary (); 1180 void init_secondary ();
1238 const char **init_resources (int argc, const char *const *argv); 1181 const char **init_resources (int argc, const char *const *argv);
1239 const char *x_resource (const char *name); 1182 const char *x_resource (const char *name);
… …
1249 void create_windows (int argc, const char *const *argv); 1192 void create_windows (int argc, const char *const *argv);
1250 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1194 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1195
1253#if USE_XIM 1196#if USE_XIM
1254 rxvt_xim *input_method; 1197 rxvt_xim *input_method;
1255 XIC Input_Context; 1198 XIC Input_Context;
1256 XIMStyle input_style; 1199 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1200 XPoint spot; // most recently sent spot position
1258 1201
1259 void im_destroy (); 1202 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1203 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1204 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1205 void im_set_position (XPoint &pos) NOTHROW;
… …
1264 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1207 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1265 1208
1266 bool IMisRunning (); 1209 bool IMisRunning ();
1267 void IMSendSpot (); 1210 void IMSendSpot ();
1268 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1269 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1270#endif 1213#endif
1271 1214
1272 void resize_scrollbar (); 1215 void resize_scrollbar ();
1273 1216
1274 // command.C 1217 // command.C
1275 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1276 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1277 1221
1278 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1279 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1280 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1284 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1285 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1286 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1287 void focus_in (); 1231 void focus_in ();
1288 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1289 int check_our_parents (); 1234 int check_our_parents ();
1290#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1291 FILE *popen_printer (); 1236 FILE *popen_printer ();
1292 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1293#endif 1238#endif
… …
1315 void set_utf8_property (Atom prop, const char *str, int len = -1); 1260 void set_utf8_property (Atom prop, const char *str, int len = -1);
1316 void set_title (const char *str); 1261 void set_title (const char *str);
1317 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1318 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1319 void set_colorfgbg (); 1264 void set_colorfgbg ();
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1265 bool set_color (rxvt_color &color, const char *name);
1266 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1268
1323 // screen.C 1269 // screen.C
1324 1270
1325 void lalloc (line_t &l) const NOTHROW 1271 void lalloc (line_t &l) const
1326 { 1272 {
1327 l.t = (text_t *)talloc->alloc (); 1273 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1274 l.r = (rend_t *)ralloc->alloc ();
1329 } 1275 }
1330 1276
… …
1334 talloc->free (l.t); 1280 talloc->free (l.t);
1335 ralloc->free (l.r); 1281 ralloc->free (l.r);
1336 } 1282 }
1337#endif 1283#endif
1338 1284
1339 void lresize (line_t &l) const NOTHROW 1285 void lresize (line_t &l) const
1340 { 1286 {
1341 if (!l.t) 1287 if (!l.t)
1342 return; 1288 return;
1343 1289
1344 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1290 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1412 void scr_remap_chars () NOTHROW; 1358 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1359 void scr_remap_chars (line_t &l) NOTHROW;
1414 1360
1415 enum cursor_mode { SAVE, RESTORE }; 1361 enum cursor_mode { SAVE, RESTORE };
1416 1362
1417 void scr_poweron () NOTHROW; 1363 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1364 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1365 void scr_do_wrap () NOTHROW;
1366 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1367 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1368 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1369 void scr_rendition (int set, int style) NOTHROW;
1423 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1370 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1424 void scr_backspace () NOTHROW; 1371 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1372 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1464# define __PROTO(p) p
1518#else 1465#else
1519# define __PROTO(p) () 1466# define __PROTO(p) ()
1520#endif 1467#endif
1521 1468
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1469#endif /* _RXVT_H_ */
1527 1470

Diff Legend

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