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.202 by root, Fri Jan 13 05:13:09 2006 UTC vs.
Revision 1.217 by root, Tue Jan 17 10:59:32 2006 UTC

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

Diff Legend

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