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.209 by root, Mon Jan 16 15:12:48 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, 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
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 261#endif
268 262
269#define R_SB_ALIGN_CENTRE 0 263#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 264#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 265#define R_SB_ALIGN_BOTTOM 2
… …
480 Rxvt_restoreFG = 39, // change default fg color 474 Rxvt_restoreFG = 39, // change default fg color
481 Rxvt_restoreBG = 49, // change default bg color 475 Rxvt_restoreBG = 49, // change default bg color
482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 476 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
483 477
484 URxvt_locale = 701, // change locale 478 URxvt_locale = 701, // change locale
485 URxvt_Menu = 703, // set menu item 479
486 URxvt_Color_IT = 704, // change actual 'Italic' colour 480 URxvt_Color_IT = 704, // change actual 'Italic' colour
487 URxvt_Color_tint = 705, // change actual tint colour 481 URxvt_Color_tint = 705, // change actual tint colour
488 URxvt_Color_BD = 706, 482 URxvt_Color_BD = 706,
489 URxvt_Color_UL = 707, 483 URxvt_Color_UL = 707,
490 484
… …
645#define PrivMode_ShiftKeys (1UL<<10) 639#define PrivMode_ShiftKeys (1UL<<10)
646#define PrivMode_VisibleCursor (1UL<<11) 640#define PrivMode_VisibleCursor (1UL<<11)
647#define PrivMode_MouseX10 (1UL<<12) 641#define PrivMode_MouseX10 (1UL<<12)
648#define PrivMode_MouseX11 (1UL<<13) 642#define PrivMode_MouseX11 (1UL<<13)
649#define PrivMode_scrollBar (1UL<<14) 643#define PrivMode_scrollBar (1UL<<14)
650#define PrivMode_menuBar (1UL<<15)
651#define PrivMode_TtyOutputInh (1UL<<16) 644#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<17) 645#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<18) 646#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<19) 647#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<20) 648#define PrivMode_LFNL (1UL<<19)
656/* too annoying to implement X11 highlight tracking */ 649/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<21) */ 650/* #define PrivMode_MouseX11Track (1LU<<20) */
658 651
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 652#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
660#define PrivMode(test,bit) \ 653#define PrivMode(test,bit) \
661 if (test) \ 654 if (test) \
662 priv_modes |= (bit); \ 655 priv_modes |= (bit); \
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 785#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 786#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 787#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 788 - scrollbar_minheight ())
796 789
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 790#ifdef XPM_BACKGROUND
809# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 791# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
810#else 792#else
811# define XPMClearArea(a, b, c, d, e, f, g) 793# define XPMClearArea(a, b, c, d, e, f, g)
812#endif 794#endif
… …
865extern bool rxvt_set_locale (const char *locale); 847extern bool rxvt_set_locale (const char *locale);
866extern void rxvt_push_locale (const char *locale); 848extern void rxvt_push_locale (const char *locale);
867extern void rxvt_pop_locale (); 849extern void rxvt_pop_locale ();
868 850
869/****************************************************************************/ 851/****************************************************************************/
870
871#ifdef MENUBAR
872# include "menubar.h"
873#endif
874 852
875#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
876#define TEXT_BLINK_INTERVAL 0.5 854#define TEXT_BLINK_INTERVAL 0.5
877 855
878#ifndef __attribute__ 856#ifndef __attribute__
… …
1062 refresh_limit, 1040 refresh_limit,
1063 last_bot, /* scrollbar last bottom position */ 1041 last_bot, /* scrollbar last bottom position */
1064 last_top, /* scrollbar last top position */ 1042 last_top, /* scrollbar last top position */
1065 last_state, /* scrollbar last state */ 1043 last_state, /* scrollbar last state */
1066 scrollbar_len, 1044 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, 1045 window_vt_x,
1075 window_vt_y, 1046 window_vt_y,
1076 window_sb_x, 1047 window_sb_x,
1077# ifdef POINTER_BLANK 1048# ifdef POINTER_BLANK
1078 pointerBlankDelay, 1049 pointerBlankDelay,
… …
1087 unsigned long priv_modes, 1058 unsigned long priv_modes,
1088 SavedModes; 1059 SavedModes;
1089/* ---------- */ 1060/* ---------- */
1090 Atom xa[NUM_XA]; 1061 Atom xa[NUM_XA];
1091/* ---------- */ 1062/* ---------- */
1092#ifdef MENUBAR 1063#ifdef RXVT_SCROLLBAR
1093 GC menubarGC;
1094#endif
1095#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1096 GC scrollbarGC, 1064 GC scrollbarGC,
1097 topShadowGC, 1065 topShadowGC,
1098 botShadowGC; 1066 botShadowGC;
1099#endif 1067#endif
1100#ifdef XTERM_SCROLLBAR 1068#ifdef XTERM_SCROLLBAR
… …
1149 row_col_t oldcursor; 1117 row_col_t oldcursor;
1150#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1151 bgPixmap_t bgPixmap; 1119 bgPixmap_t bgPixmap;
1152 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1120 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1153#endif 1121#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 1122
1163#if ENABLE_OVERLAY 1123#if ENABLE_OVERLAY
1164 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1124 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1165 text_t **ov_text; 1125 text_t **ov_text;
1166 rend_t **ov_rend; 1126 rend_t **ov_rend;
… …
1215 // modifies first argument(!) 1175 // modifies first argument(!)
1216 void paste (char *data, unsigned int len); 1176 void paste (char *data, unsigned int len);
1217 1177
1218 long vt_emask, vt_emask_perl; 1178 long vt_emask, vt_emask_perl;
1219 1179
1220 void vt_select_input () 1180 void vt_select_input () const
1221 { 1181 {
1222 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1223 } 1183 }
1224 1184
1225#if TRANSPARENT 1185#if TRANSPARENT
… …
1232 xevent_watcher termwin_ev; 1192 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1193 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1194#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1195 xevent_watcher scrollbar_ev;
1236#endif 1196#endif
1237#ifdef MENUBAR
1238 xevent_watcher menubar_ev;
1239#endif
1240 1197
1241 void check_cb (check_watcher &w); check_watcher check_ev; 1198 void check_cb (check_watcher &w); check_watcher check_ev;
1242 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1199 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1243 void flush_cb (time_watcher &w); time_watcher flush_ev; 1200 void flush_cb (time_watcher &w); time_watcher flush_ev;
1244 1201
… …
1283 1240
1284 bool init (int argc, const char *const *argv); 1241 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1242 bool init_vars ();
1286 1243
1287 bool pty_fill (); 1244 bool pty_fill ();
1245
1246 void make_current () const // make this the "currently active" urxvt instance
1247 {
1248 SET_R (this);
1249 rxvt_set_locale (locale);
1250 set_environ (envv);
1251 }
1288 1252
1289 void init_secondary (); 1253 void init_secondary ();
1290 const char **init_resources (int argc, const char *const *argv); 1254 const char **init_resources (int argc, const char *const *argv);
1291 const char *x_resource (const char *name); 1255 const char *x_resource (const char *name);
1292 void init_env (); 1256 void init_env ();
… …
1382 void set_window_color (int idx, const char *color); 1346 void set_window_color (int idx, const char *color);
1383 void set_colorfgbg (); 1347 void set_colorfgbg ();
1384 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1348 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1385 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1349 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1386 1350
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 1351 // screen.C
1421 1352
1422 void lalloc (line_t &l) 1353 void lalloc (line_t &l) const
1423 { 1354 {
1424 l.t = (text_t *)talloc->alloc (); 1355 l.t = (text_t *)talloc->alloc ();
1425 l.r = (rend_t *)ralloc->alloc (); 1356 l.r = (rend_t *)ralloc->alloc ();
1426 } 1357 }
1427 1358
… …
1431 talloc->free (l.t); 1362 talloc->free (l.t);
1432 ralloc->free (l.r); 1363 ralloc->free (l.r);
1433 } 1364 }
1434#endif 1365#endif
1435 1366
1436 void lresize (line_t &l) 1367 void lresize (line_t &l) const
1437 { 1368 {
1438 if (!l.t) 1369 if (!l.t)
1439 return; 1370 return;
1440 1371
1441 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1372 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1445 1376
1446 if (ncol > prev_ncol) 1377 if (ncol > prev_ncol)
1447 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1378 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448 } 1379 }
1449 1380
1450 int fgcolor_of (rend_t r) 1381 int fgcolor_of (rend_t r) const
1451 { 1382 {
1452 int base = GET_BASEFG (r); 1383 int base = GET_BASEFG (r);
1453#ifndef NO_BRIGHTCOLOR 1384#ifndef NO_BRIGHTCOLOR
1454 if (r & RS_Bold 1385 if (r & RS_Bold
1455# if ENABLE_STYLES 1386# if ENABLE_STYLES
… …
1459 base += minBrightCOLOR - minCOLOR; 1390 base += minBrightCOLOR - minCOLOR;
1460#endif 1391#endif
1461 return base; 1392 return base;
1462 } 1393 }
1463 1394
1464 int bgcolor_of (rend_t r) 1395 int bgcolor_of (rend_t r) const
1465 { 1396 {
1466 int base = GET_BASEBG (r); 1397 int base = GET_BASEBG (r);
1467#ifndef NO_BRIGHTCOLOR 1398#ifndef NO_BRIGHTCOLOR
1468 if (r & RS_Blink 1399 if (r & RS_Blink
1469# if ENABLE_STYLES 1400# if ENABLE_STYLES
… …
1473 base += minBrightCOLOR - minCOLOR; 1404 base += minBrightCOLOR - minCOLOR;
1474#endif 1405#endif
1475 return base; 1406 return base;
1476 } 1407 }
1477 1408
1478 bool option (uint32_t opt) 1409 bool option (uint32_t opt) const
1479 { 1410 {
1480 return OPTION (opt); 1411 return OPTION (opt);
1481 } 1412 }
1482 1413
1483 void set_option (uint32_t opt, bool set) 1414 void set_option (uint32_t opt, bool set)
… …
1486 options |= opt; 1417 options |= opt;
1487 else 1418 else
1488 options &= ~opt; 1419 options &= ~opt;
1489 } 1420 }
1490 1421
1491 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1422 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); 1423 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1493 int scr_scroll_text (int row1, int row2, int count); 1424 int scr_scroll_text (int row1, int row2, int count);
1494 void scr_reset (); 1425 void scr_reset ();
1495 void scr_release (); 1426 void scr_release ();
1496 void scr_clear (bool really = false); 1427 void scr_clear (bool really = false);
1497 void scr_refresh (unsigned char refresh_type); 1428 void scr_refresh (unsigned char refresh_type);

Diff Legend

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