ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.204 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.208 by root, Mon Jan 16 15:00:20 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 *****************************************************************************
… …
147 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
148 ***************************************************************************** 159 *****************************************************************************
149 */ 160 */
150struct grwin_t; 161struct grwin_t;
151 162
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 163/* If we're using either the rxvt scrollbar or menu bars, keep the
161 * scrollColor resource. 164 * scrollColor resource.
162 */ 165 */
163#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
164# define KEEP_SCROLLCOLOR 1 167# define KEEP_SCROLLCOLOR 1
165#else 168#else
166# undef KEEP_SCROLLCOLOR 169# undef KEEP_SCROLLCOLOR
167#endif 170#endif
168 171
… …
249#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 252#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
250# define EXIT_SUCCESS 0 /* exit function success */ 253# define EXIT_SUCCESS 0 /* exit function success */
251# define EXIT_FAILURE 1 /* exit function failure */ 254# define EXIT_FAILURE 1 /* exit function failure */
252#endif 255#endif
253 256
254#define menuBar_esc 10
255#define scrollBar_esc 30 257#define scrollBar_esc 30
256#define menuBar_margin 2 /* margin below text */
257 258
258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 259#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
259# define HAVE_SCROLLBARS 1 260# define HAVE_SCROLLBARS 1
260#endif 261#endif
261 262
262/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 263/* width of scrollBar shadow, must be 1 or 2 */
263#ifdef HALFSHADOW 264#ifdef HALFSHADOW
264# define MENU_SHADOW 1 265# define MENU_SHADOW 1
265#else 266#else
266# define MENU_SHADOW 2 267# define MENU_SHADOW 2
267#endif 268#endif
… …
645#define PrivMode_ShiftKeys (1UL<<10) 646#define PrivMode_ShiftKeys (1UL<<10)
646#define PrivMode_VisibleCursor (1UL<<11) 647#define PrivMode_VisibleCursor (1UL<<11)
647#define PrivMode_MouseX10 (1UL<<12) 648#define PrivMode_MouseX10 (1UL<<12)
648#define PrivMode_MouseX11 (1UL<<13) 649#define PrivMode_MouseX11 (1UL<<13)
649#define PrivMode_scrollBar (1UL<<14) 650#define PrivMode_scrollBar (1UL<<14)
650#define PrivMode_menuBar (1UL<<15)
651#define PrivMode_TtyOutputInh (1UL<<16) 651#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<17) 652#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<18) 653#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<19) 654#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<20) 655#define PrivMode_LFNL (1UL<<19)
656/* too annoying to implement X11 highlight tracking */ 656/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<21) */ 657/* #define PrivMode_MouseX11Track (1LU<<20) */
658 658
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
660#define PrivMode(test,bit) \ 660#define PrivMode(test,bit) \
661 if (test) \ 661 if (test) \
662 priv_modes |= (bit); \ 662 priv_modes |= (bit); \
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 792#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 793#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 794#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 795 - scrollbar_minheight ())
796 796
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 797#ifdef XPM_BACKGROUND
809# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 798# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
810#else 799#else
811# define XPMClearArea(a, b, c, d, e, f, g) 800# define XPMClearArea(a, b, c, d, e, f, g)
812#endif 801#endif
… …
865extern bool rxvt_set_locale (const char *locale); 854extern bool rxvt_set_locale (const char *locale);
866extern void rxvt_push_locale (const char *locale); 855extern void rxvt_push_locale (const char *locale);
867extern void rxvt_pop_locale (); 856extern void rxvt_pop_locale ();
868 857
869/****************************************************************************/ 858/****************************************************************************/
870
871#ifdef MENUBAR
872# include "menubar.h"
873#endif
874 859
875#define BLINK_INTERVAL 0.5 860#define BLINK_INTERVAL 0.5
876#define TEXT_BLINK_INTERVAL 0.5 861#define TEXT_BLINK_INTERVAL 0.5
877 862
878#ifndef __attribute__ 863#ifndef __attribute__
… …
1062 refresh_limit, 1047 refresh_limit,
1063 last_bot, /* scrollbar last bottom position */ 1048 last_bot, /* scrollbar last bottom position */
1064 last_top, /* scrollbar last top position */ 1049 last_top, /* scrollbar last top position */
1065 last_state, /* scrollbar last state */ 1050 last_state, /* scrollbar last state */
1066 scrollbar_len, 1051 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, 1052 window_vt_x,
1075 window_vt_y, 1053 window_vt_y,
1076 window_sb_x, 1054 window_sb_x,
1077# ifdef POINTER_BLANK 1055# ifdef POINTER_BLANK
1078 pointerBlankDelay, 1056 pointerBlankDelay,
… …
1087 unsigned long priv_modes, 1065 unsigned long priv_modes,
1088 SavedModes; 1066 SavedModes;
1089/* ---------- */ 1067/* ---------- */
1090 Atom xa[NUM_XA]; 1068 Atom xa[NUM_XA];
1091/* ---------- */ 1069/* ---------- */
1092#ifdef MENUBAR 1070#ifdef RXVT_SCROLLBAR
1093 GC menubarGC;
1094#endif
1095#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1096 GC scrollbarGC, 1071 GC scrollbarGC,
1097 topShadowGC, 1072 topShadowGC,
1098 botShadowGC; 1073 botShadowGC;
1099#endif 1074#endif
1100#ifdef XTERM_SCROLLBAR 1075#ifdef XTERM_SCROLLBAR
… …
1149 row_col_t oldcursor; 1124 row_col_t oldcursor;
1150#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1151 bgPixmap_t bgPixmap; 1126 bgPixmap_t bgPixmap;
1152 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1153#endif 1128#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
1162 1129
1163#if ENABLE_OVERLAY 1130#if ENABLE_OVERLAY
1164 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1131 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1165 text_t **ov_text; 1132 text_t **ov_text;
1166 rend_t **ov_rend; 1133 rend_t **ov_rend;
… …
1215 // modifies first argument(!) 1182 // modifies first argument(!)
1216 void paste (char *data, unsigned int len); 1183 void paste (char *data, unsigned int len);
1217 1184
1218 long vt_emask, vt_emask_perl; 1185 long vt_emask, vt_emask_perl;
1219 1186
1220 void vt_select_input () 1187 void vt_select_input () const
1221 { 1188 {
1222 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1189 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1223 } 1190 }
1224 1191
1225#if TRANSPARENT 1192#if TRANSPARENT
… …
1232 xevent_watcher termwin_ev; 1199 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1200 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1201#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1202 xevent_watcher scrollbar_ev;
1236#endif 1203#endif
1237#ifdef MENUBAR
1238 xevent_watcher menubar_ev;
1239#endif
1240 1204
1241 void check_cb (check_watcher &w); check_watcher check_ev; 1205 void check_cb (check_watcher &w); check_watcher check_ev;
1242 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1206 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1243 void flush_cb (time_watcher &w); time_watcher flush_ev; 1207 void flush_cb (time_watcher &w); time_watcher flush_ev;
1244 1208
… …
1283 1247
1284 bool init (int argc, const char *const *argv); 1248 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1249 bool init_vars ();
1286 1250
1287 bool pty_fill (); 1251 bool pty_fill ();
1252
1253 void make_current () const // make this the "currently active" urxvt instance
1254 {
1255 SET_R (this);
1256 rxvt_set_locale (locale);
1257 set_environ (envv);
1258 }
1288 1259
1289 void init_secondary (); 1260 void init_secondary ();
1290 const char **init_resources (int argc, const char *const *argv); 1261 const char **init_resources (int argc, const char *const *argv);
1291 const char *x_resource (const char *name); 1262 const char *x_resource (const char *name);
1292 void init_env (); 1263 void init_env ();
… …
1382 void set_window_color (int idx, const char *color); 1353 void set_window_color (int idx, const char *color);
1383 void set_colorfgbg (); 1354 void set_colorfgbg ();
1384 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1355 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1385 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1356 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1386 1357
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 1358 // screen.C
1421 1359
1422 void lalloc (line_t &l) 1360 void lalloc (line_t &l) const
1423 { 1361 {
1424 l.t = (text_t *)talloc->alloc (); 1362 l.t = (text_t *)talloc->alloc ();
1425 l.r = (rend_t *)ralloc->alloc (); 1363 l.r = (rend_t *)ralloc->alloc ();
1426 } 1364 }
1427 1365
… …
1431 talloc->free (l.t); 1369 talloc->free (l.t);
1432 ralloc->free (l.r); 1370 ralloc->free (l.r);
1433 } 1371 }
1434#endif 1372#endif
1435 1373
1436 void lresize (line_t &l) 1374 void lresize (line_t &l) const
1437 { 1375 {
1438 if (!l.t) 1376 if (!l.t)
1439 return; 1377 return;
1440 1378
1441 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1379 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1445 1383
1446 if (ncol > prev_ncol) 1384 if (ncol > prev_ncol)
1447 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1385 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448 } 1386 }
1449 1387
1450 int fgcolor_of (rend_t r) 1388 int fgcolor_of (rend_t r) const
1451 { 1389 {
1452 int base = GET_BASEFG (r); 1390 int base = GET_BASEFG (r);
1453#ifndef NO_BRIGHTCOLOR 1391#ifndef NO_BRIGHTCOLOR
1454 if (r & RS_Bold 1392 if (r & RS_Bold
1455# if ENABLE_STYLES 1393# if ENABLE_STYLES
… …
1459 base += minBrightCOLOR - minCOLOR; 1397 base += minBrightCOLOR - minCOLOR;
1460#endif 1398#endif
1461 return base; 1399 return base;
1462 } 1400 }
1463 1401
1464 int bgcolor_of (rend_t r) 1402 int bgcolor_of (rend_t r) const
1465 { 1403 {
1466 int base = GET_BASEBG (r); 1404 int base = GET_BASEBG (r);
1467#ifndef NO_BRIGHTCOLOR 1405#ifndef NO_BRIGHTCOLOR
1468 if (r & RS_Blink 1406 if (r & RS_Blink
1469# if ENABLE_STYLES 1407# if ENABLE_STYLES
… …
1473 base += minBrightCOLOR - minCOLOR; 1411 base += minBrightCOLOR - minCOLOR;
1474#endif 1412#endif
1475 return base; 1413 return base;
1476 } 1414 }
1477 1415
1478 bool option (uint32_t opt) 1416 bool option (uint32_t opt) const
1479 { 1417 {
1480 return OPTION (opt); 1418 return OPTION (opt);
1481 } 1419 }
1482 1420
1483 void set_option (uint32_t opt, bool set) 1421 void set_option (uint32_t opt, bool set)
… …
1486 options |= opt; 1424 options |= opt;
1487 else 1425 else
1488 options &= ~opt; 1426 options &= ~opt;
1489 } 1427 }
1490 1428
1491 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1429 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); 1430 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1493 int scr_scroll_text (int row1, int row2, int count); 1431 int scr_scroll_text (int row1, int row2, int count);
1494 void scr_reset (); 1432 void scr_reset ();
1495 void scr_release (); 1433 void scr_release ();
1496 void scr_clear (bool really = false); 1434 void scr_clear (bool really = false);
1497 void scr_refresh (unsigned char refresh_type); 1435 void scr_refresh (unsigned char refresh_type);

Diff Legend

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