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.203 by root, Fri Jan 13 07:03:48 2006 UTC vs.
Revision 1.217 by root, Tue Jan 17 10:59:32 2006 UTC

… …
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 CURSOR_BLINK 1 20# define CURSOR_BLINK 1
21#else
22# define ENABLE_MINIMAL 1
21#endif 23#endif
22 24
23#include <limits.h> 25#include <limits.h>
24 26
25#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
… …
35#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
36#include "iom.h" 38#include "iom.h"
37#include "salloc.h" 39#include "salloc.h"
38 40
39#include "rxvtperl.h" 41#include "rxvtperl.h"
42
43// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
50#endif
40 51
41/* 52/*
42 ***************************************************************************** 53 *****************************************************************************
43 * SYSTEM HACKS 54 * SYSTEM HACKS
44 ***************************************************************************** 55 *****************************************************************************
… …
118char * rxvt_Str_trim (char *str); 129char * rxvt_Str_trim (char *str);
119int rxvt_Str_escaped (char *str); 130int rxvt_Str_escaped (char *str);
120char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
121void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
122char * rxvt_File_find (const char *file, const char *ext, const char *path); 133char * rxvt_File_find (const char *file, const char *ext, const char *path);
123void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
124void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
125void rxvt_usleep (int usecs); 134void rxvt_usleep (int usecs);
126 135
127///////////////////////////////////////////////////////////////////////////// 136/////////////////////////////////////////////////////////////////////////////
128 137
129// temporarily replace the process environment 138// temporarily replace the process environment
… …
147 * STRUCTURES AND TYPEDEFS 156 * STRUCTURES AND TYPEDEFS
148 ***************************************************************************** 157 *****************************************************************************
149 */ 158 */
150struct grwin_t; 159struct grwin_t;
151 160
152/* Sanitize menubar info */
153#ifndef MENUBAR
154# undef MENUBAR_MAX
155#endif
156#ifndef MENUBAR_MAX
157# define MENUBAR_MAX 0
158#endif
159
160/* If we're using either the rxvt scrollbar or menu bars, keep the 161/* If we're using either the rxvt scrollbar, keep the
161 * scrollColor resource. 162 * scrollColor resource.
162 */ 163 */
163#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 164#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
164# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
165#else 166#else
166# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
167#endif 168#endif
168 169
… …
249#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 250#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
250# define EXIT_SUCCESS 0 /* exit function success */ 251# define EXIT_SUCCESS 0 /* exit function success */
251# define EXIT_FAILURE 1 /* exit function failure */ 252# define EXIT_FAILURE 1 /* exit function failure */
252#endif 253#endif
253 254
254#define menuBar_esc 10
255#define scrollBar_esc 30 255#define scrollBar_esc 30
256#define menuBar_margin 2 /* margin below text */
257 256
258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 257#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
259# define HAVE_SCROLLBARS 1 258# define HAVE_SCROLLBARS 1
260#endif
261
262/* width of scrollBar, menuBar shadow, must be 1 or 2 */
263#ifdef HALFSHADOW
264# define MENU_SHADOW 1
265#else
266# define MENU_SHADOW 2
267#endif 259#endif
268 260
269#define R_SB_ALIGN_CENTRE 0 261#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 262#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 263#define R_SB_ALIGN_BOTTOM 2
… …
344 * | 336 * |
345 * +---< SB_WIDTH_NEXT 337 * +---< SB_WIDTH_NEXT
346 */ 338 */
347 339
348enum { 340enum {
349 NO_REFRESH = 0 , /* Window not visible at all! */ 341 NO_REFRESH = 0, /* Window not visible at all! */
350 FAST_REFRESH = 1<<0, /* Fully exposed window */ 342 FAST_REFRESH = 1, /* Fully exposed window */
351 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 343 SLOW_REFRESH = 2, /* Partially exposed window */
352 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
353}; 344};
354 345
355#ifdef NO_SECONDARY_SCREEN 346#ifdef NO_SECONDARY_SCREEN
356# define NSCREENS 0 347# define NSCREENS 0
357#else 348#else
… …
480 Rxvt_restoreFG = 39, // change default fg color 471 Rxvt_restoreFG = 39, // change default fg color
481 Rxvt_restoreBG = 49, // change default bg color 472 Rxvt_restoreBG = 49, // change default bg color
482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 473 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
483 474
484 URxvt_locale = 701, // change locale 475 URxvt_locale = 701, // change locale
485 URxvt_Menu = 703, // set menu item 476
486 URxvt_Color_IT = 704, // change actual 'Italic' colour 477 URxvt_Color_IT = 704, // change actual 'Italic' colour
487 URxvt_Color_tint = 705, // change actual tint colour 478 URxvt_Color_tint = 705, // change actual tint colour
488 URxvt_Color_BD = 706, 479 URxvt_Color_BD = 706,
489 URxvt_Color_UL = 707, 480 URxvt_Color_UL = 707,
490 481
… …
645#define PrivMode_ShiftKeys (1UL<<10) 636#define PrivMode_ShiftKeys (1UL<<10)
646#define PrivMode_VisibleCursor (1UL<<11) 637#define PrivMode_VisibleCursor (1UL<<11)
647#define PrivMode_MouseX10 (1UL<<12) 638#define PrivMode_MouseX10 (1UL<<12)
648#define PrivMode_MouseX11 (1UL<<13) 639#define PrivMode_MouseX11 (1UL<<13)
649#define PrivMode_scrollBar (1UL<<14) 640#define PrivMode_scrollBar (1UL<<14)
650#define PrivMode_menuBar (1UL<<15)
651#define PrivMode_TtyOutputInh (1UL<<16) 641#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<17) 642#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<18) 643#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<19) 644#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<20) 645#define PrivMode_LFNL (1UL<<19)
656/* too annoying to implement X11 highlight tracking */ 646/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<21) */ 647/* #define PrivMode_MouseX11Track (1LU<<20) */
658 648
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
660#define PrivMode(test,bit) \ 650#define PrivMode(test,bit) \
661 if (test) \ 651 if (test) \
662 priv_modes |= (bit); \ 652 priv_modes |= (bit); \
… …
709/* 699/*
710 ***************************************************************************** 700 *****************************************************************************
711 * MACRO DEFINES 701 * MACRO DEFINES
712 ***************************************************************************** 702 *****************************************************************************
713 */ 703 */
704#define dLocal(type,name) type const name = this->name
714#define dDisp Display *disp = display->display 705#define dDisp Display *disp = this->display->display
715 706
716/* convert pixel dimensions to row/column values. Everything as int32_t */ 707/* convert pixel dimensions to row/column values. Everything as int32_t */
717#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 708#define Pixel2Col(x) Pixel2Width((int32_t)(x))
718#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 709#define Pixel2Row(y) Pixel2Height((int32_t)(y))
719#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 710#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 783#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 784#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 785#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 786 - scrollbar_minheight ())
796 787
797#if (MENUBAR_MAX > 1)
798/* rendition style flags */
799# define menuBar_height() (fheight + MENU_SHADOW)
800# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
801# define isMenuBarWindow(w) ((w) == menuBar.win)
802#else
803# define menuBar_height() (0)
804# define menuBar_TotalHeight() (0)
805# define isMenuBarWindow(w) (0)
806#endif
807
808#ifdef XPM_BACKGROUND 788#ifdef XPM_BACKGROUND
809# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
810#else 790#else
811# define XPMClearArea(a, b, c, d, e, f, g) 791# define XPMClearArea(a, b, c, d, e, f, g)
812#endif
813
814#ifdef UTMP_SUPPORT
815# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
816# undef HAVE_UTMPX_H
817# undef HAVE_STRUCT_UTMPX
818# endif
819# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
820# undef HAVE_UTMP_H
821# undef HAVE_STRUCT_UTMP
822# endif
823
824# ifdef HAVE_UTMPX_H
825# include <utmpx.h>
826# endif
827# ifdef HAVE_UTMP_H
828# include <utmp.h>
829# endif
830#endif 792#endif
831 793
832#ifdef DEBUG_CMD 794#ifdef DEBUG_CMD
833# define D_CMD(x) fprintf x ; fputc('\n', stderr) 795# define D_CMD(x) fprintf x ; fputc('\n', stderr)
834#else 796#else
… …
865extern bool rxvt_set_locale (const char *locale); 827extern bool rxvt_set_locale (const char *locale);
866extern void rxvt_push_locale (const char *locale); 828extern void rxvt_push_locale (const char *locale);
867extern void rxvt_pop_locale (); 829extern void rxvt_pop_locale ();
868 830
869/****************************************************************************/ 831/****************************************************************************/
870
871#ifdef MENUBAR
872# include "menubar.h"
873#endif
874 832
875#define BLINK_INTERVAL 0.5 833#define BLINK_INTERVAL 0.5
876#define TEXT_BLINK_INTERVAL 0.5 834#define TEXT_BLINK_INTERVAL 0.5
877 835
878#ifndef __attribute__ 836#ifndef __attribute__
… …
1062 refresh_limit, 1020 refresh_limit,
1063 last_bot, /* scrollbar last bottom position */ 1021 last_bot, /* scrollbar last bottom position */
1064 last_top, /* scrollbar last top position */ 1022 last_top, /* scrollbar last top position */
1065 last_state, /* scrollbar last state */ 1023 last_state, /* scrollbar last state */
1066 scrollbar_len, 1024 scrollbar_len,
1067#ifdef MENUBAR
1068 menu_readonly, /* okay to alter menu? */
1069 Arrows_x,
1070#endif
1071#if MENUBAR_MAX > 1
1072 Nbars,
1073#endif
1074 window_vt_x, 1025 window_vt_x,
1075 window_vt_y, 1026 window_vt_y,
1076 window_sb_x, 1027 window_sb_x,
1077# ifdef POINTER_BLANK 1028# ifdef POINTER_BLANK
1078 pointerBlankDelay, 1029 pointerBlankDelay,
… …
1087 unsigned long priv_modes, 1038 unsigned long priv_modes,
1088 SavedModes; 1039 SavedModes;
1089/* ---------- */ 1040/* ---------- */
1090 Atom xa[NUM_XA]; 1041 Atom xa[NUM_XA];
1091/* ---------- */ 1042/* ---------- */
1092#ifdef MENUBAR 1043#ifdef RXVT_SCROLLBAR
1093 GC menubarGC;
1094#endif
1095#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1096 GC scrollbarGC, 1044 GC scrollbarGC,
1097 topShadowGC, 1045 topShadowGC,
1098 botShadowGC; 1046 botShadowGC;
1099#endif 1047#endif
1100#ifdef XTERM_SCROLLBAR 1048#ifdef XTERM_SCROLLBAR
… …
1132 const char *key_delete; 1080 const char *key_delete;
1133#endif 1081#endif
1134 struct mouse_event MEvent; 1082 struct mouse_event MEvent;
1135 XComposeStatus compose; 1083 XComposeStatus compose;
1136 ttymode_t tio; 1084 ttymode_t tio;
1137#ifdef UTMP_SUPPORT
1138# ifdef HAVE_STRUCT_UTMP
1139 struct utmp ut;
1140# endif
1141# ifdef HAVE_STRUCT_UTMPX
1142 struct utmpx utx;
1143# endif
1144# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1145 char ut_id[5];
1146# endif
1147 int utmp_pos;
1148#endif
1149 row_col_t oldcursor; 1085 row_col_t oldcursor;
1150#ifdef XPM_BACKGROUND 1086#ifdef XPM_BACKGROUND
1151 bgPixmap_t bgPixmap; 1087 bgPixmap_t bgPixmap;
1152 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1088 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1153#endif
1154#ifdef MENUBAR
1155 menu_t *ActiveMenu, /* currently active menu */
1156 *BuildMenu; /* the menu currently being built */
1157 bar_t *CurrentBar;
1158# if ! (MENUBAR_MAX > 1)
1159 bar_t BarList;
1160# endif /* (MENUBAR_MAX > 1) */
1161#endif 1089#endif
1162 1090
1163#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1164 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1165 text_t **ov_text; 1093 text_t **ov_text;
… …
1194 const char *rs[NUM_RESOURCES]; 1122 const char *rs[NUM_RESOURCES];
1195 /* command input buffering */ 1123 /* command input buffering */
1196 char *cmdbuf_ptr, *cmdbuf_endp; 1124 char *cmdbuf_ptr, *cmdbuf_endp;
1197 char cmdbuf_base[CBUFSIZ]; 1125 char cmdbuf_base[CBUFSIZ];
1198 1126
1127 rxvt_ptytty_unix pty;
1128
1199 rxvt_salloc *talloc; // text line allocator 1129 rxvt_salloc *talloc; // text line allocator
1200 rxvt_salloc *ralloc; // rend line allocator 1130 rxvt_salloc *ralloc; // rend line allocator
1201 1131
1202 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1132 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1203 1133
… …
1215 // modifies first argument(!) 1145 // modifies first argument(!)
1216 void paste (char *data, unsigned int len); 1146 void paste (char *data, unsigned int len);
1217 1147
1218 long vt_emask, vt_emask_perl; 1148 long vt_emask, vt_emask_perl;
1219 1149
1220 void vt_select_input () 1150 void vt_select_input () const
1221 { 1151 {
1222 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1152 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1223 } 1153 }
1224 1154
1225#if TRANSPARENT 1155#if TRANSPARENT
… …
1232 xevent_watcher termwin_ev; 1162 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1163 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1164#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1165 xevent_watcher scrollbar_ev;
1236#endif 1166#endif
1237#ifdef MENUBAR
1238 xevent_watcher menubar_ev;
1239#endif
1240 1167
1241 void check_cb (check_watcher &w); check_watcher check_ev; 1168 void check_cb (check_watcher &w); check_watcher check_ev;
1242 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1169 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1243 void flush_cb (time_watcher &w); time_watcher flush_ev; 1170 void flush_cb (time_watcher &w); time_watcher flush_ev;
1244 1171
… …
1283 1210
1284 bool init (int argc, const char *const *argv); 1211 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1212 bool init_vars ();
1286 1213
1287 bool pty_fill (); 1214 bool pty_fill ();
1215
1216 void make_current () const // make this the "currently active" urxvt instance
1217 {
1218 SET_R (this);
1219 rxvt_set_locale (locale);
1220 set_environ (envv);
1221 }
1288 1222
1289 void init_secondary (); 1223 void init_secondary ();
1290 const char **init_resources (int argc, const char *const *argv); 1224 const char **init_resources (int argc, const char *const *argv);
1291 const char *x_resource (const char *name); 1225 const char *x_resource (const char *name);
1292 void init_env (); 1226 void init_env ();
… …
1367 void process_sgr_mode (unsigned int nargs, const int *arg); 1301 void process_sgr_mode (unsigned int nargs, const int *arg);
1368 void process_graphics (); 1302 void process_graphics ();
1369 // init.C 1303 // init.C
1370 void Get_Colours (); 1304 void Get_Colours ();
1371 void get_ourmods (); 1305 void get_ourmods ();
1372 // logging.C
1373 void makeutent (const char *pty, const char *hostname);
1374 void cleanutent ();
1375 // main.C 1306 // main.C
1376 void privileged_utmp (rxvt_privaction action); 1307 void privileged_utmp (rxvt_privaction action);
1377 bool set_fonts (); 1308 bool set_fonts ();
1378 void set_string_property (Atom prop, const char *str, int len = -1); 1309 void set_string_property (Atom prop, const char *str, int len = -1);
1379 void set_utf8_property (Atom prop, const char *str, int len = -1); 1310 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1382 void set_window_color (int idx, const char *color); 1313 void set_window_color (int idx, const char *color);
1383 void set_colorfgbg (); 1314 void set_colorfgbg ();
1384 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1315 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1385 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1316 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1386 1317
1387#ifdef MENUBAR
1388 // menubar.C
1389 void menuitem_free (menu_t *menu, menuitem_t *item);
1390 int action_dispatch (action_t *action);
1391 void menuarrow_free (char name);
1392 void menuarrow_add (char *string);
1393 char *menu_find_base (menu_t **menu, char *path);
1394 menu_t *menu_delete (menu_t *menu);
1395 menu_t *menu_add (menu_t *parent, char *path);
1396 void drawbox_menubar (int x, int len, int state);
1397 void drawtriangle (int x, int y, int state);
1398 void drawbox_menuitem (int y, int state);
1399 void menu_show ();
1400 void menu_display (void (rxvt_term::*update) ());
1401 void menu_hide_all ();
1402 void menu_hide ();
1403 void menu_clear (menu_t *menu);
1404 void menubar_clear ();
1405 bar_t *menubar_find (const char *name);
1406 int menubar_push (const char *name);
1407 void menubar_remove (const char *name);
1408 void menubar_dump (FILE *fp);
1409 void menubar_read (const char *filename);
1410 void menubar_dispatch (char *str);
1411 void draw_Arrows (int name, int state);
1412 void menubar_expose ();
1413 int menubar_mapping (int map);
1414 int menu_select (XButtonEvent &ev);
1415 void menubar_select (XButtonEvent &ev);
1416 void menubar_control (XButtonEvent &ev);
1417 void map_menuBar (int map);
1418#endif
1419
1420 // screen.C 1318 // screen.C
1421 1319
1422 void lalloc (line_t &l) 1320 void lalloc (line_t &l) const
1423 { 1321 {
1424 l.t = (text_t *)talloc->alloc (); 1322 l.t = (text_t *)talloc->alloc ();
1425 l.r = (rend_t *)ralloc->alloc (); 1323 l.r = (rend_t *)ralloc->alloc ();
1426 } 1324 }
1427 1325
… …
1431 talloc->free (l.t); 1329 talloc->free (l.t);
1432 ralloc->free (l.r); 1330 ralloc->free (l.r);
1433 } 1331 }
1434#endif 1332#endif
1435 1333
1436 void lresize (line_t &l) 1334 void lresize (line_t &l) const
1437 { 1335 {
1438 if (!l.t) 1336 if (!l.t)
1439 return; 1337 return;
1440 1338
1441 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1339 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1445 1343
1446 if (ncol > prev_ncol) 1344 if (ncol > prev_ncol)
1447 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1345 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448 } 1346 }
1449 1347
1450 int fgcolor_of (rend_t r) 1348 int fgcolor_of (rend_t r) const
1451 { 1349 {
1452 int base = GET_BASEFG (r); 1350 int base = GET_BASEFG (r);
1453#ifndef NO_BRIGHTCOLOR 1351#ifndef NO_BRIGHTCOLOR
1454 if (r & RS_Bold 1352 if (r & RS_Bold
1455# if ENABLE_STYLES 1353# if ENABLE_STYLES
… …
1459 base += minBrightCOLOR - minCOLOR; 1357 base += minBrightCOLOR - minCOLOR;
1460#endif 1358#endif
1461 return base; 1359 return base;
1462 } 1360 }
1463 1361
1464 int bgcolor_of (rend_t r) 1362 int bgcolor_of (rend_t r) const
1465 { 1363 {
1466 int base = GET_BASEBG (r); 1364 int base = GET_BASEBG (r);
1467#ifndef NO_BRIGHTCOLOR 1365#ifndef NO_BRIGHTCOLOR
1468 if (r & RS_Blink 1366 if (r & RS_Blink
1469# if ENABLE_STYLES 1367# if ENABLE_STYLES
… …
1473 base += minBrightCOLOR - minCOLOR; 1371 base += minBrightCOLOR - minCOLOR;
1474#endif 1372#endif
1475 return base; 1373 return base;
1476 } 1374 }
1477 1375
1478 bool option (uint32_t opt) 1376 bool option (uint32_t opt) const
1479 { 1377 {
1480 return OPTION (opt); 1378 return OPTION (opt);
1481 } 1379 }
1482 1380
1483 void set_option (uint32_t opt, bool set) 1381 void set_option (uint32_t opt, bool set)
… …
1486 options |= opt; 1384 options |= opt;
1487 else 1385 else
1488 options &= ~opt; 1386 options &= ~opt;
1489 } 1387 }
1490 1388
1491 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1492 void scr_blank_screen_mem (line_t &l, rend_t efs); 1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1493 int scr_scroll_text (int row1, int row2, int count); 1391 int scr_scroll_text (int row1, int row2, int count);
1494 void scr_reset (); 1392 void scr_reset ();
1495 void scr_release (); 1393 void scr_release ();
1496 void scr_clear (bool really = false); 1394 void scr_clear (bool really = false);
1497 void scr_refresh (unsigned char refresh_type); 1395 void scr_refresh ();
1498 bool scr_refresh_rend (rend_t mask, rend_t value); 1396 bool scr_refresh_rend (rend_t mask, rend_t value);
1499 void scr_erase_screen (int mode); 1397 void scr_erase_screen (int mode);
1500#if ENABLE_FRILLS 1398#if ENABLE_FRILLS
1501 void scr_erase_savelines (); 1399 void scr_erase_savelines ();
1502 void scr_backindex (); 1400 void scr_backindex ();
… …
1533 void scr_rvideo_mode (int mode); 1431 void scr_rvideo_mode (int mode);
1534 void scr_report_position (); 1432 void scr_report_position ();
1535 void set_font_style (); 1433 void set_font_style ();
1536 void scr_charset_choose (int set); 1434 void scr_charset_choose (int set);
1537 void scr_charset_set (int set, unsigned int ch); 1435 void scr_charset_set (int set, unsigned int ch);
1538 int scr_move_to (int y, int len); 1436 void scr_move_to (int y, int len);
1539 int scr_page (enum page_dirn direction, int nlines); 1437 bool scr_page (enum page_dirn direction, int nlines);
1540 int scr_changeview (unsigned int oldviewstart); 1438 bool scr_changeview (int new_view_start);
1541 void scr_bell (); 1439 void scr_bell ();
1542 void scr_printscreen (int fullhist); 1440 void scr_printscreen (int fullhist);
1543 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1441 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1544 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1442 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1545 void scr_reverse_selection (); 1443 void scr_reverse_selection ();
… …
1566 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1464 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1567#endif 1465#endif
1568 1466
1569#if defined(RXVT_SCROLLBAR) 1467#if defined(RXVT_SCROLLBAR)
1570 // scrollbar-rxvt.C 1468 // scrollbar-rxvt.C
1571 void Draw_button (int x, int y, int state, int dirn);
1572 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1469 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1573#endif 1470#endif
1574 1471
1575#if defined(XTERM_SCROLLBAR) 1472#if defined(XTERM_SCROLLBAR)
1576 // scrollbar-xterm.C 1473 // scrollbar-xterm.C

Diff Legend

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