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.166 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.186 by root, Wed Jan 4 04:42:45 2006 UTC

… …
70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
… …
162 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
165}; 156};
166 157
167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
168
169#if ENABLE_FRILLS 158#if ENABLE_FRILLS
170typedef struct _mwmhints { 159typedef struct _mwmhints {
171 CARD32 flags; 160 CARD32 flags;
172 CARD32 functions; 161 CARD32 functions;
173 CARD32 decorations; 162 CARD32 decorations;
… …
224 213
225#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
226# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
227#endif 216#endif
228 217
229#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
230# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
231#endif 220#endif
232 221
233/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
234 223
… …
249# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
250#endif 239#endif
251 240
252/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
253#ifdef HALFSHADOW 242#ifdef HALFSHADOW
254# define SHADOW 1 243# define MENU_SHADOW 1
255#else 244#else
256# define SHADOW 2 245# define MENU_SHADOW 2
257#endif 246#endif
258 247
259#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
260#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
261#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
… …
353#define FONT_DN "#-" 342#define FONT_DN "#-"
354#define FONT_UP "#+" 343#define FONT_UP "#+"
355 344
356/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
357enum { 346enum {
358 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
359 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
360 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
361}; 350};
362 351
363/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
364enum { 353enum {
365 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
378enum { 367enum {
379 PRIMARY = 0, 368 PRIMARY = 0,
380 SECONDARY, 369 SECONDARY,
381}; 370};
382 371
383#define RS_None 0 /* Normal */ 372#define RS_None 0
384 373
385#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
386#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
387 376
388// font styles 377// font styles
389#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
390#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
391 380
392// fake styles 381// fake styles
393#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
394#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
395#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
396 385
397// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
398 390
399// other flags 391// other flags
400#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
401 393
402#define RS_styleCount 4 394#define RS_styleCount 4
… …
477 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
478 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
479 471
480 URxvt_view_up = 720, 472 URxvt_view_up = 720,
481 URxvt_view_down = 721, 473 URxvt_view_down = 721,
474
475 URxvt_perl = 777,
482}; 476};
483 477
484/* Words starting with `Color_' are colours. Others are counts */ 478/* Words starting with `Color_' are colours. Others are counts */
485/* 479/*
486 * The PixColor and rendition colour usage should probably be decoupled 480 * The PixColor and rendition colour usage should probably be decoupled
… …
563 557
564/* 558/*
565 * Resource list 559 * Resource list
566 */ 560 */
567enum { 561enum {
568 Rs_display_name = 0, 562# define def(name) Rs_ ## name,
569 Rs_term_name, 563# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
570 Rs_iconName, 564# include "rsinc.h"
571 Rs_geometry, 565# undef def
572 Rs_reverseVideo, 566# undef reserve
573 Rs_color,
574 _Rs_color = Rs_color + NRS_COLORS - 1,
575 Rs_font,
576#if ENABLE_STYLES
577 Rs_boldFont,
578 Rs_italicFont,
579 Rs_boldItalicFont,
580#endif
581 Rs_name,
582 Rs_title,
583#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
584 Rs_path,
585#endif
586#ifdef XPM_BACKGROUND
587 Rs_backgroundPixmap,
588#endif
589#if (MENUBAR_MAX)
590 Rs_menu,
591#endif
592 Rs_loginShell,
593 Rs_jumpScroll,
594#ifdef HAVE_SCROLLBARS
595 Rs_scrollBar,
596 Rs_scrollBar_right,
597 Rs_scrollBar_floating,
598 Rs_scrollBar_align,
599 Rs_scrollstyle, /* Rs_scrollBar_style */
600 Rs_scrollBar_thickness,
601#endif
602 Rs_scrollTtyOutput,
603 Rs_scrollTtyKeypress,
604 Rs_scrollWithBuffer,
605 Rs_saveLines,
606 Rs_utmpInhibit,
607 Rs_visualBell,
608#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
609 Rs_mapAlert,
610#endif
611#ifdef META8_OPTION
612 Rs_meta8,
613#endif
614#ifdef MOUSE_WHEEL
615 Rs_mouseWheelScrollPage,
616#endif
617#ifndef NO_BACKSPACE_KEY
618 Rs_backspace_key,
619#endif
620#ifndef NO_DELETE_KEY
621 Rs_delete_key,
622#endif
623 Rs_selectstyle,
624#ifdef PRINTPIPE
625 Rs_print_pipe,
626#endif
627#ifdef USE_XIM
628 Rs_preeditType,
629 Rs_inputMethod,
630#endif
631#ifdef TRANSPARENT
632 Rs_transparent,
633 Rs_transparent_all,
634#endif
635#if ENABLE_FRILLS
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_pty_fd,
641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 567 NUM_RESOURCES
670}; 568};
671 569
672// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
673enum { 571enum {
… …
748#endif 646#endif
749 647
750// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
755 653
756#ifndef PATH_MAX 654#ifndef PATH_MAX
757# define PATH_MAX 16384 655# define PATH_MAX 16384
758#endif 656#endif
759 657
… …
787/* 685/*
788 ***************************************************************************** 686 *****************************************************************************
789 * MACRO DEFINES 687 * MACRO DEFINES
790 ***************************************************************************** 688 *****************************************************************************
791 */ 689 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z))
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 690#define dDisp Display *disp = display->display
809 691
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 697#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 698#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 701
820#define TermWin_TotalWidth() ((int32_t)this->width) 702// for m >= -n, ensure remainder lies between 0..n-1
821#define TermWin_TotalHeight() ((int32_t)this->height) 703#define MOD(m,n) (((m) + (n)) % (n))
822 704
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 705#define LINENO(n) MOD (term_start + int(n), total_rows)
824#define ROW(n) (save [LINENO (n)]) 706#define ROW(n) row_buf [LINENO (n)]
825 707
826/* how to build & extract colors and attributes */ 708/* how to build & extract colors and attributes */
827#define GET_BASEFG(x) (((x) & RS_fgMask)) 709#define GET_BASEFG(x) (((x) & RS_fgMask))
828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 710#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
829#ifndef NO_BRIGHTCOLOR
830# define GET_FGCOLOR(x) \
831 ((((x) & RS_Bold) == 0 \
832 || GET_BASEFG (x) < minCOLOR \
833 || GET_BASEFG (x) >= minBrightCOLOR) \
834 ? GET_BASEFG (x) \
835 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
836# define GET_BGCOLOR(x) \
837 ((((x) & RS_Blink) == 0 \
838 || GET_BASEBG (x) < minCOLOR \
839 || GET_BASEBG (x) >= minBrightCOLOR) \
840 ? GET_BASEBG (x) \
841 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
842#else
843# define GET_FGCOLOR(x) GET_BASEFG(x)
844# define GET_BGCOLOR(x) GET_BASEBG(x)
845#endif
846 711
847#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 712#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
848#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 713#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
849 714
850#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 715#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
900#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 765#define scrollbar_size() (scrollBar.end - scrollBar.beg \
901 - scrollbar_minheight ()) 766 - scrollbar_minheight ())
902 767
903#if (MENUBAR_MAX > 1) 768#if (MENUBAR_MAX > 1)
904/* rendition style flags */ 769/* rendition style flags */
905# define menuBar_height() (fheight + SHADOW) 770# define menuBar_height() (fheight + MENU_SHADOW)
906# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 771# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
907# define isMenuBarWindow(w) ((w) == menuBar.win) 772# define isMenuBarWindow(w) ((w) == menuBar.win)
908#else 773#else
909# define menuBar_height() (0) 774# define menuBar_height() (0)
910# define menuBar_TotalHeight() (0) 775# define menuBar_TotalHeight() (0)
911# define isMenuBarWindow(w) (0) 776# define isMenuBarWindow(w) (0)
… …
957#endif 822#endif
958 823
959extern class rxvt_failure_exception { } rxvt_failure_exception; 824extern class rxvt_failure_exception { } rxvt_failure_exception;
960 825
961typedef callback1<void, const char *> log_callback; 826typedef callback1<void, const char *> log_callback;
827typedef callback1<int, int> getfd_callback;
962 828
963extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 829extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
964extern void rxvt_log (const char *fmt, ...); 830extern void rxvt_log (const char *fmt, ...);
965extern void rxvt_warn (const char *fmt, ...); 831extern void rxvt_warn (const char *fmt, ...);
966extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
967extern void rxvt_exit_failure () __attribute__ ((noreturn)); 833extern void rxvt_exit_failure () __attribute__ ((noreturn));
968 834
969#define SET_LOCALE(locale) rxvt_set_locale (locale) 835#define SET_LOCALE(locale) rxvt_set_locale (locale)
970extern bool rxvt_set_locale (const char *locale); 836extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale ();
971 839
972/* 840/*
973 ***************************************************************************** 841 *****************************************************************************
974 * VARIABLES 842 * VARIABLES
975 ***************************************************************************** 843 *****************************************************************************
… …
1043 class keyboard_manager; 911 class keyboard_manager;
1044#endif 912#endif
1045 913
1046struct rxvt_term : zero_initialized, rxvt_vars { 914struct rxvt_term : zero_initialized, rxvt_vars {
1047 log_callback *log_hook; // log error messages through this hook, if != 0 915 log_callback *log_hook; // log error messages through this hook, if != 0
916 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
917
918#if ENABLE_PERL
919 void *self; // perl's $self
920#endif
1048 921
1049 struct mbstate mbstate; // current input multibyte state 922 struct mbstate mbstate; // current input multibyte state
1050 923
1051 unsigned char want_refresh:1, 924 unsigned char want_refresh:1,
1052#ifdef TRANSPARENT 925#ifdef TRANSPARENT
… …
1203 bar_t *CurrentBar; 1076 bar_t *CurrentBar;
1204# if ! (MENUBAR_MAX > 1) 1077# if ! (MENUBAR_MAX > 1)
1205 bar_t BarList; 1078 bar_t BarList;
1206# endif /* (MENUBAR_MAX > 1) */ 1079# endif /* (MENUBAR_MAX > 1) */
1207#endif 1080#endif
1208#ifdef CURSOR_BLINK
1209 struct timeval lastcursorchange;
1210#endif
1211#ifdef POINTER_BLANK
1212 struct timeval lastmotion;
1213#endif
1214 1081
1215#if ENABLE_OVERLAY 1082#if ENABLE_OVERLAY
1216 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1083 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1217 text_t **ov_text; 1084 text_t **ov_text;
1218 rend_t **ov_rend; 1085 rend_t **ov_rend;
… …
1233 char *env_display; /* environmental variable DISPLAY */ 1100 char *env_display; /* environmental variable DISPLAY */
1234 char *env_term; /* environmental variable TERM */ 1101 char *env_term; /* environmental variable TERM */
1235 char *env_colorfgbg; 1102 char *env_colorfgbg;
1236 char *locale; 1103 char *locale;
1237 char charsets[4]; 1104 char charsets[4];
1238 unsigned char *v_buffer; /* pointer to physical buffer */ 1105 char *v_buffer; /* pointer to physical buffer */
1239 unsigned int v_buflen; /* size of area to write */ 1106 unsigned int v_buflen; /* size of area to write */
1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1107 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241 1108
1242#ifdef KEYSYM_RESOURCE 1109#ifdef KEYSYM_RESOURCE
1243 keyboard_manager *keyboard; 1110 keyboard_manager *keyboard;
1244#endif 1111#endif
1245 1112
1246 const char *rs[NUM_RESOURCES]; 1113 const char *rs[NUM_RESOURCES];
1247 /* command input buffering */ 1114 /* command input buffering */
1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1115 char *cmdbuf_ptr, *cmdbuf_endp;
1249 unsigned char cmdbuf_base[CBUFSIZ]; 1116 char cmdbuf_base[CBUFSIZ];
1250 1117
1251 rxvt_salloc *talloc; // text line allocator 1118 rxvt_salloc *talloc; // text line allocator
1252 rxvt_salloc *ralloc; // rend line allocator 1119 rxvt_salloc *ralloc; // rend line allocator
1253 1120
1254 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1121 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1257 // ISO 14755 entry support 1124 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1125 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1126 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1127 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1128# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1129 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1263 void iso14755_54 (int x, int y); 1130 void iso14755_54 (int x, int y);
1264# endif 1131# endif
1265#endif 1132#endif
1266 1133
1267 // modifies first argument(!) 1134 // modifies first argument(!)
1268 void paste (unsigned char *data, unsigned int len); 1135 void paste (char *data, unsigned int len);
1269 1136
1270 void flush (); 1137 void flush ();
1271 1138
1272#if TRANSPARENT 1139#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1140 void rootwin_cb (XEvent &xev);
… …
1314 void pointer_blank (); 1181 void pointer_blank ();
1315#endif 1182#endif
1316 void pointer_unblank (); 1183 void pointer_unblank ();
1317 1184
1318 void tt_printf (const char *fmt,...); 1185 void tt_printf (const char *fmt,...);
1319 void tt_write (const unsigned char *data, unsigned int len); 1186 void tt_write (const char *data, unsigned int len);
1320 void pty_write (); 1187 void pty_write ();
1321 1188
1322 void tt_winch (); 1189 void tt_winch ();
1323 1190
1324 rxvt_term (); 1191 rxvt_term ();
1325 ~rxvt_term (); 1192 ~rxvt_term ();
1193 void child_exit (); // child has exited, usually destroys
1326 void destroy (); 1194 void destroy ();
1327 void emergency_cleanup (); 1195 void emergency_cleanup ();
1328 1196
1329 bool init (int argc, const char *const *argv); 1197 bool init (int argc, const char *const *argv);
1330 bool init_vars (); 1198 bool init_vars ();
… …
1375 1243
1376 /* autoconvert */ 1244 /* autoconvert */
1377 1245
1378 // command.C 1246 // command.C
1379 void lookup_key (XKeyEvent &ev); 1247 void lookup_key (XKeyEvent &ev);
1380 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1248 unsigned int cmd_write (const char *str, unsigned int count);
1381 1249
1382 unicode_t next_char (); 1250 unicode_t next_char ();
1383 unicode_t cmd_getc (); 1251 unicode_t cmd_getc ();
1384 unicode_t next_octet (); 1252 unicode_t next_octet ();
1385 unicode_t cmd_get8 (); 1253 unicode_t cmd_get8 ();
… …
1399 void process_nonprinting (unicode_t ch); 1267 void process_nonprinting (unicode_t ch);
1400 void process_escape_vt52 (unicode_t ch); 1268 void process_escape_vt52 (unicode_t ch);
1401 void process_escape_seq (); 1269 void process_escape_seq ();
1402 void process_csi_seq (); 1270 void process_csi_seq ();
1403 void process_window_ops (const int *args, unsigned int nargs); 1271 void process_window_ops (const int *args, unsigned int nargs);
1404 unsigned char *get_to_st (unicode_t &ends_how); 1272 char *get_to_st (unicode_t &ends_how);
1405 void process_dcs_seq (); 1273 void process_dcs_seq ();
1406 void process_osc_seq (); 1274 void process_osc_seq ();
1407 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1275 void process_color_seq (int report, int color, const char *str, char resp);
1408 void process_xterm_seq (int op, const char *str, unsigned char resp); 1276 void process_xterm_seq (int op, const char *str, char resp);
1409 int privcases (int mode, unsigned long bit); 1277 int privcases (int mode, unsigned long bit);
1410 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1278 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1411 void process_sgr_mode (unsigned int nargs, const int *arg); 1279 void process_sgr_mode (unsigned int nargs, const int *arg);
1412 void process_graphics (); 1280 void process_graphics ();
1413 // init.C 1281 // init.C
… …
1467 { 1335 {
1468 l.t = (text_t *)talloc->alloc (); 1336 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc (); 1337 l.r = (rend_t *)ralloc->alloc ();
1470 } 1338 }
1471 1339
1340#if 0
1472 void lfree (line_t &l) 1341 void lfree (line_t &l)
1473 { 1342 {
1474 talloc->free (l.t); 1343 talloc->free (l.t);
1475 ralloc->free (l.r); 1344 ralloc->free (l.r);
1476 } 1345 }
1346#endif
1477 1347
1478 void lresize (line_t &l) 1348 void lresize (line_t &l)
1479 { 1349 {
1480 if (!l.t) 1350 if (!l.t)
1481 return; 1351 return;
… …
1487 1357
1488 if (ncol > prev_ncol) 1358 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1359 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 } 1360 }
1491 1361
1362 int fgcolor_of (rend_t r)
1363 {
1364 int base = GET_BASEFG (r);
1365#ifndef NO_BRIGHTCOLOR
1366 if (r & RS_Bold
1367# if ENABLE_STYLES
1368 && OPTION (Opt_intensityStyles)
1369# endif
1370 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1371 base += minBrightCOLOR - minCOLOR;
1372#endif
1373 return base;
1374 }
1375
1376 int bgcolor_of (rend_t r)
1377 {
1378 int base = GET_BASEBG (r);
1379#ifndef NO_BRIGHTCOLOR
1380 if (r & RS_Blink
1381# if ENABLE_STYLES
1382 && OPTION (Opt_intensityStyles)
1383# endif
1384 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1385 base += minBrightCOLOR - minCOLOR;
1386#endif
1387 return base;
1388 }
1389
1492 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1493 void scr_blank_screen_mem (line_t &l, rend_t efs); 1391 void scr_blank_screen_mem (line_t &l, rend_t efs);
1494 int scr_scroll_text (int row1, int row2, int count); 1392 int scr_scroll_text (int row1, int row2, int count);
1495 void scr_reset (); 1393 void scr_reset ();
1496 void scr_reset_realloc ();
1497 void scr_release (); 1394 void scr_release ();
1498 void scr_clear (bool really = false); 1395 void scr_clear (bool really = false);
1499 void scr_refresh (unsigned char refresh_type); 1396 void scr_refresh (unsigned char refresh_type);
1500 bool scr_refresh_rend (rend_t mask, rend_t value); 1397 bool scr_refresh_rend (rend_t mask, rend_t value);
1501 void scr_erase_screen (int mode); 1398 void scr_erase_screen (int mode);
… …
1549 void selection_property (Window win, Atom prop); 1446 void selection_property (Window win, Atom prop);
1550 void selection_request (Time tm, int x, int y); 1447 void selection_request (Time tm, int x, int y);
1551 int selection_request_other (Atom target, int selnum); 1448 int selection_request_other (Atom target, int selnum);
1552 void selection_clear (); 1449 void selection_clear ();
1553 void selection_make (Time tm); 1450 void selection_make (Time tm);
1451 bool selection_grab (Time tm);
1554 void selection_start_colrow (int col, int row); 1452 void selection_start_colrow (int col, int row);
1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1453 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1556 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1454 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1557 void selection_remove_trailing_spaces (); 1455 void selection_remove_trailing_spaces ();
1558 void selection_send (const XSelectionRequestEvent &rq); 1456 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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