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.224 by root, Thu Jan 19 19:51:08 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 *****************************************************************************
… …
95RETSIGTYPE rxvt_Exit_signal (int sig); 106RETSIGTYPE rxvt_Exit_signal (int sig);
96void rxvt_clean_exit (); 107void rxvt_clean_exit ();
97void * rxvt_malloc (size_t size); 108void * rxvt_malloc (size_t size);
98void * rxvt_calloc (size_t number, size_t size); 109void * rxvt_calloc (size_t number, size_t size);
99void * rxvt_realloc (void *ptr, size_t size); 110void * rxvt_realloc (void *ptr, size_t size);
100void rxvt_privileges (rxvt_privaction action);
101 111
102// util.C 112// util.C
103char * rxvt_wcstombs (const wchar_t *str, int len = -1); 113char * rxvt_wcstombs (const wchar_t *str, int len = -1);
104wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 114wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
105char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 115char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
… …
118char * rxvt_Str_trim (char *str); 128char * rxvt_Str_trim (char *str);
119int rxvt_Str_escaped (char *str); 129int rxvt_Str_escaped (char *str);
120char ** rxvt_splitcommastring (const char *cs); 130char ** rxvt_splitcommastring (const char *cs);
121void rxvt_freecommastring (char **cs); 131void rxvt_freecommastring (char **cs);
122char * rxvt_File_find (const char *file, const char *ext, const char *path); 132char * 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); 133void rxvt_usleep (int usecs);
126 134
127///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
128 136
129// temporarily replace the process environment 137// temporarily replace the process environment
… …
147 * STRUCTURES AND TYPEDEFS 155 * STRUCTURES AND TYPEDEFS
148 ***************************************************************************** 156 *****************************************************************************
149 */ 157 */
150struct grwin_t; 158struct grwin_t;
151 159
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 160/* If we're using either the rxvt scrollbar, keep the
161 * scrollColor resource. 161 * scrollColor resource.
162 */ 162 */
163#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 163#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
164# define KEEP_SCROLLCOLOR 1 164# define KEEP_SCROLLCOLOR 1
165#else 165#else
166# undef KEEP_SCROLLCOLOR 166# undef KEEP_SCROLLCOLOR
167#endif 167#endif
168 168
… …
170typedef struct { 170typedef struct {
171 short w, h, x, y; 171 short w, h, x, y;
172 Pixmap pixmap; 172 Pixmap pixmap;
173} bgPixmap_t; 173} bgPixmap_t;
174#endif 174#endif
175
176struct rxvt_ptytty {
177 int pty; // pty file descriptor; connected to rxvt
178 int tty; // tty file descriptor; connected to child
179
180 virtual ~rxvt_ptytty ()
181 {
182 //
183 }
184
185 virtual bool get () = 0;
186#if UTMP_SUPPORT
187 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
188#endif
189
190 void close_tty ();
191 bool make_controlling_tty ();
192 void set_utf8_mode (bool on);
193};
194
195rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
196void rxvt_ptytty_server (); // start the ptytty server process
175 197
176/* 198/*
177 * the 'essential' information for reporting Mouse Events 199 * the 'essential' information for reporting Mouse Events
178 * pared down from XButtonEvent 200 * pared down from XButtonEvent
179 */ 201 */
… …
249#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 271#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
250# define EXIT_SUCCESS 0 /* exit function success */ 272# define EXIT_SUCCESS 0 /* exit function success */
251# define EXIT_FAILURE 1 /* exit function failure */ 273# define EXIT_FAILURE 1 /* exit function failure */
252#endif 274#endif
253 275
254#define menuBar_esc 10
255#define scrollBar_esc 30 276#define scrollBar_esc 30
256#define menuBar_margin 2 /* margin below text */
257 277
258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 278#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
259# define HAVE_SCROLLBARS 1 279# 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 280#endif
268 281
269#define R_SB_ALIGN_CENTRE 0 282#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 283#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 284#define R_SB_ALIGN_BOTTOM 2
… …
344 * | 357 * |
345 * +---< SB_WIDTH_NEXT 358 * +---< SB_WIDTH_NEXT
346 */ 359 */
347 360
348enum { 361enum {
349 NO_REFRESH = 0 , /* Window not visible at all! */ 362 NO_REFRESH = 0, /* Window not visible at all! */
350 FAST_REFRESH = 1<<0, /* Fully exposed window */ 363 FAST_REFRESH = 1, /* Fully exposed window */
351 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 364 SLOW_REFRESH = 2, /* Partially exposed window */
352 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
353}; 365};
354 366
355#ifdef NO_SECONDARY_SCREEN 367#ifdef NO_SECONDARY_SCREEN
356# define NSCREENS 0 368# define NSCREENS 0
357#else 369#else
… …
480 Rxvt_restoreFG = 39, // change default fg color 492 Rxvt_restoreFG = 39, // change default fg color
481 Rxvt_restoreBG = 49, // change default bg color 493 Rxvt_restoreBG = 49, // change default bg color
482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 494 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
483 495
484 URxvt_locale = 701, // change locale 496 URxvt_locale = 701, // change locale
485 URxvt_Menu = 703, // set menu item 497
486 URxvt_Color_IT = 704, // change actual 'Italic' colour 498 URxvt_Color_IT = 704, // change actual 'Italic' colour
487 URxvt_Color_tint = 705, // change actual tint colour 499 URxvt_Color_tint = 705, // change actual tint colour
488 URxvt_Color_BD = 706, 500 URxvt_Color_BD = 706,
489 URxvt_Color_UL = 707, 501 URxvt_Color_UL = 707,
490 502
… …
645#define PrivMode_ShiftKeys (1UL<<10) 657#define PrivMode_ShiftKeys (1UL<<10)
646#define PrivMode_VisibleCursor (1UL<<11) 658#define PrivMode_VisibleCursor (1UL<<11)
647#define PrivMode_MouseX10 (1UL<<12) 659#define PrivMode_MouseX10 (1UL<<12)
648#define PrivMode_MouseX11 (1UL<<13) 660#define PrivMode_MouseX11 (1UL<<13)
649#define PrivMode_scrollBar (1UL<<14) 661#define PrivMode_scrollBar (1UL<<14)
650#define PrivMode_menuBar (1UL<<15)
651#define PrivMode_TtyOutputInh (1UL<<16) 662#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<17) 663#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<18) 664#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<19) 665#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<20) 666#define PrivMode_LFNL (1UL<<19)
656/* too annoying to implement X11 highlight tracking */ 667/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<21) */ 668/* #define PrivMode_MouseX11Track (1LU<<20) */
658 669
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 670#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
660#define PrivMode(test,bit) \ 671#define PrivMode(test,bit) \
661 if (test) \ 672 if (test) \
662 priv_modes |= (bit); \ 673 priv_modes |= (bit); \
… …
709/* 720/*
710 ***************************************************************************** 721 *****************************************************************************
711 * MACRO DEFINES 722 * MACRO DEFINES
712 ***************************************************************************** 723 *****************************************************************************
713 */ 724 */
725#define dLocal(type,name) type const name = this->name
714#define dDisp Display *disp = display->display 726#define dDisp Display *disp = this->display->display
715 727
716/* convert pixel dimensions to row/column values. Everything as int32_t */ 728/* convert pixel dimensions to row/column values. Everything as int32_t */
717#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 729#define Pixel2Col(x) Pixel2Width((int32_t)(x))
718#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 730#define Pixel2Row(y) Pixel2Height((int32_t)(y))
719#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 731#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 804#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 805#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 806#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 807 - scrollbar_minheight ())
796 808
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 809#ifdef XPM_BACKGROUND
809# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 810# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
810#else 811#else
811# define XPMClearArea(a, b, c, d, e, f, g) 812# 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 813#endif
831 814
832#ifdef DEBUG_CMD 815#ifdef DEBUG_CMD
833# define D_CMD(x) fprintf x ; fputc('\n', stderr) 816# define D_CMD(x) fprintf x ; fputc('\n', stderr)
834#else 817#else
… …
865extern bool rxvt_set_locale (const char *locale); 848extern bool rxvt_set_locale (const char *locale);
866extern void rxvt_push_locale (const char *locale); 849extern void rxvt_push_locale (const char *locale);
867extern void rxvt_pop_locale (); 850extern void rxvt_pop_locale ();
868 851
869/****************************************************************************/ 852/****************************************************************************/
870
871#ifdef MENUBAR
872# include "menubar.h"
873#endif
874 853
875#define BLINK_INTERVAL 0.5 854#define BLINK_INTERVAL 0.5
876#define TEXT_BLINK_INTERVAL 0.5 855#define TEXT_BLINK_INTERVAL 0.5
877 856
878#ifndef __attribute__ 857#ifndef __attribute__
… …
1062 refresh_limit, 1041 refresh_limit,
1063 last_bot, /* scrollbar last bottom position */ 1042 last_bot, /* scrollbar last bottom position */
1064 last_top, /* scrollbar last top position */ 1043 last_top, /* scrollbar last top position */
1065 last_state, /* scrollbar last state */ 1044 last_state, /* scrollbar last state */
1066 scrollbar_len, 1045 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, 1046 window_vt_x,
1075 window_vt_y, 1047 window_vt_y,
1076 window_sb_x, 1048 window_sb_x,
1077# ifdef POINTER_BLANK 1049# ifdef POINTER_BLANK
1078 pointerBlankDelay, 1050 pointerBlankDelay,
… …
1087 unsigned long priv_modes, 1059 unsigned long priv_modes,
1088 SavedModes; 1060 SavedModes;
1089/* ---------- */ 1061/* ---------- */
1090 Atom xa[NUM_XA]; 1062 Atom xa[NUM_XA];
1091/* ---------- */ 1063/* ---------- */
1092#ifdef MENUBAR 1064#ifdef RXVT_SCROLLBAR
1093 GC menubarGC;
1094#endif
1095#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1096 GC scrollbarGC, 1065 GC scrollbarGC,
1097 topShadowGC, 1066 topShadowGC,
1098 botShadowGC; 1067 botShadowGC;
1099#endif 1068#endif
1100#ifdef XTERM_SCROLLBAR 1069#ifdef XTERM_SCROLLBAR
… …
1132 const char *key_delete; 1101 const char *key_delete;
1133#endif 1102#endif
1134 struct mouse_event MEvent; 1103 struct mouse_event MEvent;
1135 XComposeStatus compose; 1104 XComposeStatus compose;
1136 ttymode_t tio; 1105 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; 1106 row_col_t oldcursor;
1150#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1151 bgPixmap_t bgPixmap; 1108 bgPixmap_t bgPixmap;
1152 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1109 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 1110#endif
1162 1111
1163#if ENABLE_OVERLAY 1112#if ENABLE_OVERLAY
1164 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1113 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1165 text_t **ov_text; 1114 text_t **ov_text;
… …
1194 const char *rs[NUM_RESOURCES]; 1143 const char *rs[NUM_RESOURCES];
1195 /* command input buffering */ 1144 /* command input buffering */
1196 char *cmdbuf_ptr, *cmdbuf_endp; 1145 char *cmdbuf_ptr, *cmdbuf_endp;
1197 char cmdbuf_base[CBUFSIZ]; 1146 char cmdbuf_base[CBUFSIZ];
1198 1147
1148 rxvt_ptytty *pty;
1149
1199 rxvt_salloc *talloc; // text line allocator 1150 rxvt_salloc *talloc; // text line allocator
1200 rxvt_salloc *ralloc; // rend line allocator 1151 rxvt_salloc *ralloc; // rend line allocator
1201 1152
1202 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1153 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1203 1154
… …
1215 // modifies first argument(!) 1166 // modifies first argument(!)
1216 void paste (char *data, unsigned int len); 1167 void paste (char *data, unsigned int len);
1217 1168
1218 long vt_emask, vt_emask_perl; 1169 long vt_emask, vt_emask_perl;
1219 1170
1220 void vt_select_input () 1171 void vt_select_input () const
1221 { 1172 {
1222 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1173 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1223 } 1174 }
1224 1175
1225#if TRANSPARENT 1176#if TRANSPARENT
… …
1232 xevent_watcher termwin_ev; 1183 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1184 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1185#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1186 xevent_watcher scrollbar_ev;
1236#endif 1187#endif
1237#ifdef MENUBAR
1238 xevent_watcher menubar_ev;
1239#endif
1240 1188
1189 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1241 void check_cb (check_watcher &w); check_watcher check_ev; 1190 void check_cb (check_watcher &w); check_watcher check_ev;
1242 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1191 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1243 void flush_cb (time_watcher &w); time_watcher flush_ev; 1192 void flush_cb (time_watcher &w); time_watcher flush_ev;
1244 1193
1245 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1194 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
… …
1275 1224
1276 void tt_winch (); 1225 void tt_winch ();
1277 1226
1278 rxvt_term (); 1227 rxvt_term ();
1279 ~rxvt_term (); 1228 ~rxvt_term ();
1280 void child_exit (); // child has exited, usually destroys
1281 void destroy (); 1229 void destroy ();
1282 void emergency_cleanup (); 1230 void emergency_cleanup ();
1283 1231
1284 bool init (int argc, const char *const *argv); 1232 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1233 bool init_vars ();
1286 1234
1287 bool pty_fill (); 1235 bool pty_fill ();
1236
1237 void make_current () const // make this the "currently active" urxvt instance
1238 {
1239 SET_R (this);
1240 rxvt_set_locale (locale);
1241 set_environ (envv);
1242 }
1288 1243
1289 void init_secondary (); 1244 void init_secondary ();
1290 const char **init_resources (int argc, const char *const *argv); 1245 const char **init_resources (int argc, const char *const *argv);
1291 const char *x_resource (const char *name); 1246 const char *x_resource (const char *name);
1292 void init_env (); 1247 void init_env ();
… …
1367 void process_sgr_mode (unsigned int nargs, const int *arg); 1322 void process_sgr_mode (unsigned int nargs, const int *arg);
1368 void process_graphics (); 1323 void process_graphics ();
1369 // init.C 1324 // init.C
1370 void Get_Colours (); 1325 void Get_Colours ();
1371 void get_ourmods (); 1326 void get_ourmods ();
1372 // logging.C
1373 void makeutent (const char *pty, const char *hostname);
1374 void cleanutent ();
1375 // main.C 1327 // main.C
1376 void privileged_utmp (rxvt_privaction action);
1377 bool set_fonts (); 1328 bool set_fonts ();
1378 void set_string_property (Atom prop, const char *str, int len = -1); 1329 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); 1330 void set_utf8_property (Atom prop, const char *str, int len = -1);
1380 void set_title (const char *str); 1331 void set_title (const char *str);
1381 void set_icon_name (const char *str); 1332 void set_icon_name (const char *str);
1382 void set_window_color (int idx, const char *color); 1333 void set_window_color (int idx, const char *color);
1383 void set_colorfgbg (); 1334 void set_colorfgbg ();
1384 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1335 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1385 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1336 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1386 1337
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 1338 // screen.C
1421 1339
1422 void lalloc (line_t &l) 1340 void lalloc (line_t &l) const
1423 { 1341 {
1424 l.t = (text_t *)talloc->alloc (); 1342 l.t = (text_t *)talloc->alloc ();
1425 l.r = (rend_t *)ralloc->alloc (); 1343 l.r = (rend_t *)ralloc->alloc ();
1426 } 1344 }
1427 1345
… …
1431 talloc->free (l.t); 1349 talloc->free (l.t);
1432 ralloc->free (l.r); 1350 ralloc->free (l.r);
1433 } 1351 }
1434#endif 1352#endif
1435 1353
1436 void lresize (line_t &l) 1354 void lresize (line_t &l) const
1437 { 1355 {
1438 if (!l.t) 1356 if (!l.t)
1439 return; 1357 return;
1440 1358
1441 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1359 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1445 1363
1446 if (ncol > prev_ncol) 1364 if (ncol > prev_ncol)
1447 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1365 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448 } 1366 }
1449 1367
1450 int fgcolor_of (rend_t r) 1368 int fgcolor_of (rend_t r) const
1451 { 1369 {
1452 int base = GET_BASEFG (r); 1370 int base = GET_BASEFG (r);
1453#ifndef NO_BRIGHTCOLOR 1371#ifndef NO_BRIGHTCOLOR
1454 if (r & RS_Bold 1372 if (r & RS_Bold
1455# if ENABLE_STYLES 1373# if ENABLE_STYLES
… …
1459 base += minBrightCOLOR - minCOLOR; 1377 base += minBrightCOLOR - minCOLOR;
1460#endif 1378#endif
1461 return base; 1379 return base;
1462 } 1380 }
1463 1381
1464 int bgcolor_of (rend_t r) 1382 int bgcolor_of (rend_t r) const
1465 { 1383 {
1466 int base = GET_BASEBG (r); 1384 int base = GET_BASEBG (r);
1467#ifndef NO_BRIGHTCOLOR 1385#ifndef NO_BRIGHTCOLOR
1468 if (r & RS_Blink 1386 if (r & RS_Blink
1469# if ENABLE_STYLES 1387# if ENABLE_STYLES
… …
1473 base += minBrightCOLOR - minCOLOR; 1391 base += minBrightCOLOR - minCOLOR;
1474#endif 1392#endif
1475 return base; 1393 return base;
1476 } 1394 }
1477 1395
1478 bool option (uint32_t opt) 1396 bool option (uint32_t opt) const
1479 { 1397 {
1480 return OPTION (opt); 1398 return OPTION (opt);
1481 } 1399 }
1482 1400
1483 void set_option (uint32_t opt, bool set) 1401 void set_option (uint32_t opt, bool set)
… …
1486 options |= opt; 1404 options |= opt;
1487 else 1405 else
1488 options &= ~opt; 1406 options &= ~opt;
1489 } 1407 }
1490 1408
1491 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1409 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); 1410 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1493 int scr_scroll_text (int row1, int row2, int count); 1411 int scr_scroll_text (int row1, int row2, int count);
1494 void scr_reset (); 1412 void scr_reset ();
1495 void scr_release (); 1413 void scr_release ();
1496 void scr_clear (bool really = false); 1414 void scr_clear (bool really = false);
1497 void scr_refresh (unsigned char refresh_type); 1415 void scr_refresh ();
1498 bool scr_refresh_rend (rend_t mask, rend_t value); 1416 bool scr_refresh_rend (rend_t mask, rend_t value);
1499 void scr_erase_screen (int mode); 1417 void scr_erase_screen (int mode);
1500#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1501 void scr_erase_savelines (); 1419 void scr_erase_savelines ();
1502 void scr_backindex (); 1420 void scr_backindex ();
… …
1507 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1425 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1508 void scr_recolour (); 1426 void scr_recolour ();
1509 void scr_remap_chars (); 1427 void scr_remap_chars ();
1510 void scr_remap_chars (line_t &l); 1428 void scr_remap_chars (line_t &l);
1511 1429
1430 enum cursor_mode { SAVE, RESTORE };
1431
1512 void scr_poweron (); 1432 void scr_poweron ();
1513 void scr_cursor (int mode); 1433 void scr_cursor (cursor_mode mode);
1514 void scr_do_wrap (); 1434 void scr_do_wrap ();
1515 int scr_change_screen (int scrn); 1435 int scr_change_screen (int scrn);
1516 void scr_color (unsigned int color, int fgbg); 1436 void scr_color (unsigned int color, int fgbg);
1517 void scr_rendition (int set, int style); 1437 void scr_rendition (int set, int style);
1518 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1438 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
… …
1533 void scr_rvideo_mode (int mode); 1453 void scr_rvideo_mode (int mode);
1534 void scr_report_position (); 1454 void scr_report_position ();
1535 void set_font_style (); 1455 void set_font_style ();
1536 void scr_charset_choose (int set); 1456 void scr_charset_choose (int set);
1537 void scr_charset_set (int set, unsigned int ch); 1457 void scr_charset_set (int set, unsigned int ch);
1538 int scr_move_to (int y, int len); 1458 void scr_move_to (int y, int len);
1539 int scr_page (enum page_dirn direction, int nlines); 1459 bool scr_page (enum page_dirn direction, int nlines);
1540 int scr_changeview (unsigned int oldviewstart); 1460 bool scr_changeview (int new_view_start);
1541 void scr_bell (); 1461 void scr_bell ();
1542 void scr_printscreen (int fullhist); 1462 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); 1463 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); 1464 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1545 void scr_reverse_selection (); 1465 void scr_reverse_selection ();
1546 void scr_dump (int fd); 1466 void scr_dump (int fd);
1547 void selection_check (int check_more); 1467 void selection_check (int check_more);
1548 void selection_paste (Window win, Atom prop, bool delete_prop); 1468 void selection_paste (Window win, Atom prop, bool delete_prop);
1549 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop);
1550 void selection_request (Time tm, int x, int y); 1470 void selection_request (Time tm);
1551 int selection_request_other (Atom target, int selnum); 1471 int selection_request_other (Atom target, int selnum);
1552 void selection_clear (); 1472 void selection_clear ();
1553 void selection_make (Time tm); 1473 void selection_make (Time tm);
1554 bool selection_grab (Time tm); 1474 bool selection_grab (Time tm);
1555 void selection_start_colrow (int col, int row); 1475 void selection_start_colrow (int col, int row);
… …
1566 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1486 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1567#endif 1487#endif
1568 1488
1569#if defined(RXVT_SCROLLBAR) 1489#if defined(RXVT_SCROLLBAR)
1570 // scrollbar-rxvt.C 1490 // 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); 1491 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1573#endif 1492#endif
1574 1493
1575#if defined(XTERM_SCROLLBAR) 1494#if defined(XTERM_SCROLLBAR)
1576 // scrollbar-xterm.C 1495 // scrollbar-xterm.C

Diff Legend

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