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.102 by root, Tue Aug 17 02:18:38 2004 UTC vs.
Revision 1.121 by root, Wed Aug 25 03:52:09 2004 UTC

… …
123#endif 123#endif
124 124
125/* If we're using either the rxvt scrollbar or menu bars, keep the 125/* If we're using either the rxvt scrollbar or menu bars, keep the
126 * scrollColor resource. 126 * scrollColor resource.
127 */ 127 */
128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
129# define KEEP_SCROLLCOLOR 1 129# define KEEP_SCROLLCOLOR 1
130#else 130#else
131# undef KEEP_SCROLLCOLOR 131# undef KEEP_SCROLLCOLOR
132#endif 132#endif
133 133
… …
183# define COLORTERMENVFULL COLORTERMENV "-xpm" 183# define COLORTERMENVFULL COLORTERMENV "-xpm"
184#else 184#else
185# define COLORTERMENVFULL COLORTERMENV 185# define COLORTERMENVFULL COLORTERMENV
186#endif 186#endif
187#ifndef TERMENV 187#ifndef TERMENV
188# define TERMENV "rxvt" 188# define TERMENV "rxvt-unicode"
189#endif 189#endif
190 190
191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
192# define NO_MOUSE_REPORT_SCROLLBAR 1 192# define NO_MOUSE_REPORT_SCROLLBAR 1
193#endif 193#endif
… …
350 SECONDARY, 350 SECONDARY,
351}; 351};
352 352
353#define RS_None 0 /* Normal */ 353#define RS_None 0 /* Normal */
354 354
355#define RS_fgMask 0x000001FFUL /* 512 colors */ 355#define RS_fgMask 0x0000007fUL /* 128 colors */
356#define RS_bgMask 0x0003FE00UL /* 512 colors */ 356#define RS_bgMask 0x00003f80UL /* 128 colors */
357
358// font styles
357#define RS_Bold 0x00040000UL /* bold */ 359#define RS_Bold 0x00004000UL // value 1
358#define RS_Italic 0x00080000UL 360#define RS_Italic 0x00008000UL // value 2
361
362// fake styles
359#define RS_Blink 0x00100000UL /* blink */ 363#define RS_Blink 0x00010000UL /* blink */
360#define RS_RVid 0x00200000UL /* reverse video */ 364#define RS_RVid 0x00020000UL /* reverse video */
361#define RS_Uline 0x00400000UL /* underline */ 365#define RS_Uline 0x00040000UL /* underline */
362 366
367// 5 bits still to go
368
369// other flags
370#define RS_Careful 0x80000000UL /* be careful when drawing these */
371
363#define RS_fontCount 512 372#define RS_styleCount 4
364#define RS_fontMask 0xff800000UL /* plenty(?) of fonts */ 373#define RS_styleMask (RS_Bold | RS_Italic)
365#define RS_fontShift 23 374#define RS_styleShift 14
366 375
367#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 376#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
368#define RS_attrMask (RS_baseattrMask|RS_fontMask) 377#define RS_attrMask (RS_baseattrMask | RS_fontMask)
378
379#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
380#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
381#define RS_fontShift 24
382
383#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
384#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
369 385
370#define Sel_none 0 /* Not waiting */ 386#define Sel_none 0 /* Not waiting */
371#define Sel_normal 0x01 /* normal selection */ 387#define Sel_normal 0x01 /* normal selection */
372#define Sel_incr 0x02 /* incremental selection */ 388#define Sel_incr 0x02 /* incremental selection */
373#define Sel_direct 0x00 389#define Sel_direct 0x00
… …
419 XTerm_Pixmap = 20, // new bg pixmap 435 XTerm_Pixmap = 20, // new bg pixmap
420 XTerm_restoreFG = 39, // change default fg color 436 XTerm_restoreFG = 39, // change default fg color
421 XTerm_restoreBG = 49, // change default bg color 437 XTerm_restoreBG = 49, // change default bg color
422 XTerm_dumpscreen = 55, // dump scrollback and all of screen 438 XTerm_dumpscreen = 55, // dump scrollback and all of screen
423 XTerm_locale = 701, // change locale 439 XTerm_locale = 701, // change locale
424 XTerm_findfont = 702, // find font of given character (in decimal)
425 XTerm_Menu = 703, // set menu item 440 XTerm_Menu = 703, // set menu item
441 XTerm_Color_IT = 704, // change actual 'Italic' colour
442 XTerm_Color_tint = 705, // change actual tint colour
443
444 URxvt_font = 710,
445 URxvt_boldFont = 711,
446 URxvt_italicFont = 712,
447 URxvt_boldItalicFont = 713,
426}; 448};
427 449
428/* Words starting with `Color_' are colours. Others are counts */ 450/* Words starting with `Color_' are colours. Others are counts */
429/* 451/*
430 * The following comment is mostly obsolete since pixcolor_set was expanded: 452 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
459 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 481 maxBrightCOLOR, /* minBrightCOLOR + 7 */
460 Color_White = maxBrightCOLOR, 482 Color_White = maxBrightCOLOR,
461#else 483#else
462 Color_White = maxCOLOR, 484 Color_White = maxCOLOR,
463#endif 485#endif
464#ifdef TTY_256COLOR
465 min256COLOR = Color_White + 1, 486 minTermCOLOR = Color_White + 1,
466 max256COLOR = minCOLOR + 255, 487 maxTermCOLOR = Color_White + 72,
467#endif
468#ifndef NO_CURSORCOLOR 488#ifndef NO_CURSORCOLOR
469 Color_cursor, 489 Color_cursor,
470 Color_cursor2, 490 Color_cursor2,
471#endif 491#endif
472 Color_pointer_fg, 492 Color_pointer_fg,
473 Color_pointer_bg, 493 Color_pointer_bg,
474 Color_border, 494 Color_border,
475#ifndef NO_BOLD_UNDERLINE_REVERSE 495#ifndef NO_BOLD_UNDERLINE_REVERSE
476 Color_BD, 496 Color_BD,
497 Color_IT,
477 Color_UL, 498 Color_UL,
478 Color_RV, 499 Color_RV,
479#endif 500#endif
480#ifdef OPTION_HC 501#ifdef OPTION_HC
481 Color_HC, 502 Color_HC,
… …
489#endif 510#endif
490 NRS_COLORS, /* */ 511 NRS_COLORS, /* */
491#ifdef KEEP_SCROLLCOLOR 512#ifdef KEEP_SCROLLCOLOR
492 Color_topShadow = NRS_COLORS, 513 Color_topShadow = NRS_COLORS,
493 Color_bottomShadow, 514 Color_bottomShadow,
494 TOTAL_COLORS /* upto 30 */ 515 TOTAL_COLORS
495#else 516#else
496 TOTAL_COLORS = NRS_COLORS /* */ 517 TOTAL_COLORS = NRS_COLORS
497#endif 518#endif
498}; 519};
499 520
500#define Color_Bits 9 521#define Color_Bits 7 // 0 .. maxTermCOLOR
522
501#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 523#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
502#define NPIXCLR_BITS 32 524#define NPIXCLR_BITS 32
503
504#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
505 525
506/* 526/*
507 * Resource list 527 * Resource list
508 */ 528 */
509enum { 529enum {
… …
513 Rs_geometry, 533 Rs_geometry,
514 Rs_reverseVideo, 534 Rs_reverseVideo,
515 Rs_color, 535 Rs_color,
516 _Rs_color = Rs_color + NRS_COLORS - 1, 536 _Rs_color = Rs_color + NRS_COLORS - 1,
517 Rs_font, 537 Rs_font,
538#if ENABLE_STYLES
539 Rs_boldFont,
540 Rs_italicFont,
541 Rs_boldItalicFont,
542#endif
518 Rs_name, 543 Rs_name,
519 Rs_title, 544 Rs_title,
520#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 545#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
521 Rs_path, 546 Rs_path,
522#endif 547#endif
… …
587 Rs_pointerBlankDelay, 612 Rs_pointerBlankDelay,
588 Rs_imLocale, 613 Rs_imLocale,
589#ifndef NO_SECONDARY_SCREEN 614#ifndef NO_SECONDARY_SCREEN
590 Rs_secondaryScreen, 615 Rs_secondaryScreen,
591 Rs_secondaryScroll, 616 Rs_secondaryScroll,
592#endif
593#ifndef NO_BOLD_UNDERLINE_REVERSE
594 Rs_realBold,
595#endif 617#endif
596#ifdef OFF_FOCUS_FADING 618#ifdef OFF_FOCUS_FADING
597 Rs_fade, 619 Rs_fade,
598#endif 620#endif
599#ifdef TINTING 621#ifdef TINTING
… …
754# define GET_FGCOLOR(x) GET_BASEFG(x) 776# define GET_FGCOLOR(x) GET_BASEFG(x)
755# define GET_BGCOLOR(x) GET_BASEBG(x) 777# define GET_BGCOLOR(x) GET_BASEBG(x)
756#endif 778#endif
757 779
758#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 780#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
759#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 781#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
782
783#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
784#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
760 785
761#define GET_ATTR(x) (((x) & RS_attrMask)) 786#define GET_ATTR(x) (((x) & RS_attrMask))
762#define GET_BGATTR(x) \ 787#define GET_BGATTR(x) \
763 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 788 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
764 | (((x) & RS_fgMask)<<Color_Bits)) \ 789 | (((x) & RS_fgMask)<<Color_Bits)) \
765 : ((x) & (RS_attrMask | RS_bgMask))) 790 : ((x) & (RS_attrMask | RS_bgMask)))
766#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 791#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
767#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 792#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
768#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 793#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
794
795#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
769 796
770#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 797#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
771#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 798#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
799
800#if ENABLE_STYLES
801# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
802#else
803# define FONTSET(style) TermWin.fontset[0]
804#endif
772 805
773#ifdef HAVE_SCROLLBARS 806#ifdef HAVE_SCROLLBARS
774# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 807# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
775#else 808#else
776# define scrollbar_TotalWidth() (0) 809# define scrollbar_TotalWidth() (0)
… …
942 975
943extern class rxvt_composite_vec rxvt_composite; 976extern class rxvt_composite_vec rxvt_composite;
944#endif 977#endif
945 978
946 979
947struct rxvt_term : rxvt_vars { 980struct rxvt_term : zero_initialized, rxvt_vars {
948 log_callback *log_hook; // log error messages through this hook, if != 0 981 log_callback *log_hook; // log error messages through this hook, if != 0
949 982
950 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
951 984
952 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
… …
970#ifdef POINTER_BLANK 1003#ifdef POINTER_BLANK
971 hidden_pointer:1, 1004 hidden_pointer:1,
972#endif 1005#endif
973// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1006// enc_utf8:1, /* wether terminal reads/writes utf-8 */
974 seen_input:1, /* wether we have seen some program output yet */ 1007 seen_input:1, /* wether we have seen some program output yet */
1008 seen_resize:1, /* wether we had a resize event */
975 parsed_geometry:1; 1009 parsed_geometry:1;
976 1010
977 unsigned char refresh_type, 1011 unsigned char refresh_type,
978#ifdef META8_OPTION 1012#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 1013 meta_char, /* Alt-key prefix */
… …
1025# endif 1059# endif
1026 allowedxerror; 1060 allowedxerror;
1027/* ---------- */ 1061/* ---------- */
1028 unsigned int ModMetaMask, 1062 unsigned int ModMetaMask,
1029 ModNumLockMask, 1063 ModNumLockMask,
1030#ifndef NO_BRIGHTCOLOR
1031 colorfgbg,
1032#endif
1033 old_width, /* last used width in screen resize */ 1064 old_width, /* last used width in screen resize */
1034 old_height; /* last used height in screen resize */ 1065 old_height; /* last used height in screen resize */
1035 unsigned long priv_modes, 1066 unsigned long priv_modes,
1036 SavedModes; 1067 SavedModes;
1037/* ---------- */ 1068/* ---------- */
… …
1128 void scr_swap_overlay (); 1159 void scr_swap_overlay ();
1129 void scr_overlay_new (int x, int y, int w, int h); 1160 void scr_overlay_new (int x, int y, int w, int h);
1130 void scr_overlay_off (); 1161 void scr_overlay_off ();
1131 void scr_overlay_set (int x, int y, 1162 void scr_overlay_set (int x, int y,
1132 text_t text, 1163 text_t text,
1133 rend_t rend = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg)); 1164 rend_t rend = OVERLAY_RSTYLE);
1134 void scr_overlay_set (int x, int y, const char *s); 1165 void scr_overlay_set (int x, int y, const char *s);
1135#endif 1166#endif
1136 1167
1137 vector<void *> allocated; // free these memory blocks with free() 1168 vector<void *> allocated; // free these memory blocks with free()
1138 1169
… …
1165 // ISO 14755 entry support 1196 // ISO 14755 entry support
1166 unicode_t iso14755buf; 1197 unicode_t iso14755buf;
1167 void commit_iso14755 (); 1198 void commit_iso14755 ();
1168 int hex_keyval (XKeyEvent &ev); 1199 int hex_keyval (XKeyEvent &ev);
1169# if ISO_14755 1200# if ISO_14755
1170 void iso14755_51 (wchar_t ch); 1201 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1171 void iso14755_54 (int x, int y); 1202 void iso14755_54 (int x, int y);
1172# endif 1203# endif
1173#endif 1204#endif
1174 1205
1175 void paste (const unsigned char *data, unsigned int len); 1206 void paste (const unsigned char *data, unsigned int len);
… …
1233 1264
1234 bool init (int argc, const char *const *argv); 1265 bool init (int argc, const char *const *argv);
1235 bool init_vars (); 1266 bool init_vars ();
1236 1267
1237 bool pty_fill (); 1268 bool pty_fill ();
1238
1239 void *operator new (size_t s);
1240 void operator delete (void *p, size_t s);
1241 1269
1242 void init_secondary (); 1270 void init_secondary ();
1243 const char **init_resources (int argc, const char *const *argv); 1271 const char **init_resources (int argc, const char *const *argv);
1244 void init_env (); 1272 void init_env ();
1245 void set_locale (const char *locale); 1273 void set_locale (const char *locale);
… …
1318 // logging.C 1346 // logging.C
1319 void makeutent (const char *pty, const char *hostname); 1347 void makeutent (const char *pty, const char *hostname);
1320 void cleanutent (); 1348 void cleanutent ();
1321 // main.C 1349 // main.C
1322 void privileged_utmp (rxvt_privaction action); 1350 void privileged_utmp (rxvt_privaction action);
1323 bool change_font (const char *fontname); 1351 bool set_fonts ();
1324 bool font_up_down (int n, int direction);
1325 void set_title (const char *str); 1352 void set_title (const char *str);
1326 void set_icon_name (const char *str); 1353 void set_icon_name (const char *str);
1327 void set_window_color (int idx, const char *color); 1354 void set_window_color (int idx, const char *color);
1328 void set_colorfgbg (); 1355 void set_colorfgbg ();
1329 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1356 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1373 void scr_refresh (unsigned char refresh_type); 1400 void scr_refresh (unsigned char refresh_type);
1374 bool scr_refresh_rend (rend_t mask, rend_t value); 1401 bool scr_refresh_rend (rend_t mask, rend_t value);
1375 void scr_erase_screen (int mode); 1402 void scr_erase_screen (int mode);
1376 void scr_touch (bool refresh); 1403 void scr_touch (bool refresh);
1377 void scr_expose (int x, int y, int width, int height, bool refresh); 1404 void scr_expose (int x, int y, int width, int height, bool refresh);
1405 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1406 void scr_recolour ();
1378 void scr_remap_chars (); 1407 void scr_remap_chars ();
1379 void scr_remap_chars (text_t *tp, rend_t *rp); 1408 void scr_remap_chars (text_t *tp, rend_t *rp);
1380 1409
1381 void scr_poweron (); 1410 void scr_poweron ();
1382 void scr_cursor (int mode); 1411 void scr_cursor (int mode);
… …
1384 int scr_change_screen (int scrn); 1413 int scr_change_screen (int scrn);
1385 void scr_color (unsigned int color, int fgbg); 1414 void scr_color (unsigned int color, int fgbg);
1386 void scr_rendition (int set, int style); 1415 void scr_rendition (int set, int style);
1387 void scr_add_lines (const unicode_t *str, int nlines, int len); 1416 void scr_add_lines (const unicode_t *str, int nlines, int len);
1388 void scr_backspace (); 1417 void scr_backspace ();
1389 void scr_tab (int count); 1418 void scr_tab (int count, bool ht = false);
1390 void scr_backindex (); 1419 void scr_backindex ();
1391 void scr_forwardindex (); 1420 void scr_forwardindex ();
1392 void scr_gotorc (int row, int col, int relative); 1421 void scr_gotorc (int row, int col, int relative);
1393 void scr_index (enum page_dirn direction); 1422 void scr_index (enum page_dirn direction);
1394 void scr_erase_line (int mode); 1423 void scr_erase_line (int mode);
… …
1406 void set_font_style (); 1435 void set_font_style ();
1407 void scr_charset_choose (int set); 1436 void scr_charset_choose (int set);
1408 void scr_charset_set (int set, unsigned int ch); 1437 void scr_charset_set (int set, unsigned int ch);
1409 int scr_move_to (int y, int len); 1438 int scr_move_to (int y, int len);
1410 int scr_page (enum page_dirn direction, int nlines); 1439 int scr_page (enum page_dirn direction, int nlines);
1411 int scr_changeview (uint16_t oldviewstart); 1440 int scr_changeview (unsigned int oldviewstart);
1412 void scr_bell (); 1441 void scr_bell ();
1413 void scr_printscreen (int fullhist); 1442 void scr_printscreen (int fullhist);
1414 void scr_reverse_selection (); 1443 void scr_reverse_selection ();
1415 void scr_dump (int fd); 1444 void scr_dump (int fd);
1416 void selection_check (int check_more); 1445 void selection_check (int check_more);

Diff Legend

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