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.184 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.188 by root, Fri Jan 6 18:33:30 2006 UTC

… …
557 557
558/* 558/*
559 * Resource list 559 * Resource list
560 */ 560 */
561enum { 561enum {
562#define Rs_def(name) Rs_ ## name, 562# define def(name) Rs_ ## name,
563#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 563# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
564#include "rsinc.h" 564# include "rsinc.h"
565#undef Rs_def 565# undef def
566#undef Rs_reserve 566# undef reserve
567 NUM_RESOURCES 567 NUM_RESOURCES
568}; 568};
569 569
570// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
571enum { 571enum {
… …
685/* 685/*
686 ***************************************************************************** 686 *****************************************************************************
687 * MACRO DEFINES 687 * MACRO DEFINES
688 ***************************************************************************** 688 *****************************************************************************
689 */ 689 */
690#define memset(x, y, z) memset((x), (y), (size_t)(z))
691#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
692#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
693#define strcasecmp(x, y) strcasecmp((x), (y))
694#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
695#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
696#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
697#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
698#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
699#define strcat(x, y) strcat((char *)(x), (const char *)(y))
700#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
701#define strdup(x) strdup((const char *)(x))
702#define strlen(x) strlen((const char *)(x))
703#define strchr(x, y) strchr((const char *)(x), (int)(y))
704#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
705
706#define dDisp Display *disp = display->display 690#define dDisp Display *disp = display->display
707 691
708/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
709#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
710#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
713#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 697#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
714#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 698#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
717 701
718#define TermWin_TotalWidth() ((int32_t)this->width)
719#define TermWin_TotalHeight() ((int32_t)this->height)
720
721// for m >= -n, ensure remainder lies between 0..n-1 702// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n)) 703#define MOD(m,n) (((m) + (n)) % (n))
723 704
724#define LINENO(n) MOD (term_start + int(n), total_rows) 705#define LINENO(n) MOD (term_start + int(n), total_rows)
725#define ROW(n) row_buf [LINENO (n)] 706#define ROW(n) row_buf [LINENO (n)]
… …
854#define SET_LOCALE(locale) rxvt_set_locale (locale) 835#define SET_LOCALE(locale) rxvt_set_locale (locale)
855extern bool rxvt_set_locale (const char *locale); 836extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale); 837extern bool rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale (); 838extern void rxvt_pop_locale ();
858 839
859/*
860 ***************************************************************************** 840/****************************************************************************/
861 * VARIABLES 841
862 *****************************************************************************
863 */
864#ifdef MENUBAR 842#ifdef MENUBAR
865# include "menubar.h" 843# include "menubar.h"
866#endif 844#endif
867 845
868#define BLINK_INTERVAL 0.5 846#define BLINK_INTERVAL 0.5
… …
875# endif 853# endif
876# endif 854# endif
877# define __attribute__(x) 855# define __attribute__(x)
878#endif 856#endif
879 857
858/****************************************************************************/
859
860#define LINE_LONGER 0x0001 // line is continued on the next row
861#define LINE_FILTERED 0x0002 // line has been filtered
862#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
863
864struct line_t {
865 text_t *t; // terminal the text
866 rend_t *r; // rendition, uses RS_ flags
867 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
868 uint32_t f; // flags
869
870 bool is_longer ()
871 {
872 return f & LINE_LONGER;
873 }
874
875 void is_longer (int set)
876 {
877 if (set)
878 f |= LINE_LONGER;
879 else
880 f &= ~LINE_LONGER;
881 }
882
883 void clear ()
884 {
885 t = 0;
886 r = 0;
887 l = 0;
888 f = 0;
889 }
890
891 void touch () // call whenever a line is changed/touched/updated
892 {
893#if ENABLE_PERL
894 f &= ~LINE_FILTERED;
895#endif
896 }
897
898 void touch (int col)
899 {
900 max_it (l, col);
901 touch ();
902 }
903};
904
905/****************************************************************************/
906
880// primivite wrapper around mbstate_t to ensure initialisation 907// primivite wrapper around mbstate_t to ensure initialisation
881struct mbstate { 908struct mbstate {
882 mbstate_t mbs; 909 mbstate_t mbs;
883 910
884 operator mbstate_t *() { return &mbs; } 911 operator mbstate_t *() { return &mbs; }
885 void reset () { memset (&mbs, 0, sizeof (mbs)); } 912 void reset () { memset (&mbs, 0, sizeof (mbs)); }
886 mbstate () { reset (); } 913 mbstate () { reset (); }
887}; 914};
915
916/****************************************************************************/
888 917
889#define UNICODE_MASK 0x1fffffUL 918#define UNICODE_MASK 0x1fffffUL
890 919
891#if UNICODE3 920#if UNICODE3
892# define COMPOSE_LO 0x40000000UL 921# define COMPOSE_LO 0x40000000UL
… …
923}; 952};
924 953
925extern class rxvt_composite_vec rxvt_composite; 954extern class rxvt_composite_vec rxvt_composite;
926#endif 955#endif
927 956
957/****************************************************************************/
928 958
929#ifdef KEYSYM_RESOURCE 959#ifdef KEYSYM_RESOURCE
930 class keyboard_manager; 960 class keyboard_manager;
931#endif 961#endif
932 962
… …
1095 bar_t *CurrentBar; 1125 bar_t *CurrentBar;
1096# if ! (MENUBAR_MAX > 1) 1126# if ! (MENUBAR_MAX > 1)
1097 bar_t BarList; 1127 bar_t BarList;
1098# endif /* (MENUBAR_MAX > 1) */ 1128# endif /* (MENUBAR_MAX > 1) */
1099#endif 1129#endif
1100#ifdef CURSOR_BLINK
1101 struct timeval lastcursorchange;
1102#endif
1103#ifdef POINTER_BLANK
1104 struct timeval lastmotion;
1105#endif
1106 1130
1107#if ENABLE_OVERLAY 1131#if ENABLE_OVERLAY
1108 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1132 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109 text_t **ov_text; 1133 text_t **ov_text;
1110 rend_t **ov_rend; 1134 rend_t **ov_rend;
… …
1125 char *env_display; /* environmental variable DISPLAY */ 1149 char *env_display; /* environmental variable DISPLAY */
1126 char *env_term; /* environmental variable TERM */ 1150 char *env_term; /* environmental variable TERM */
1127 char *env_colorfgbg; 1151 char *env_colorfgbg;
1128 char *locale; 1152 char *locale;
1129 char charsets[4]; 1153 char charsets[4];
1130 unsigned char *v_buffer; /* pointer to physical buffer */ 1154 char *v_buffer; /* pointer to physical buffer */
1131 unsigned int v_buflen; /* size of area to write */ 1155 unsigned int v_buflen; /* size of area to write */
1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1156 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133 1157
1134#ifdef KEYSYM_RESOURCE 1158#ifdef KEYSYM_RESOURCE
1135 keyboard_manager *keyboard; 1159 keyboard_manager *keyboard;
1136#endif 1160#endif
1137 1161
1138 const char *rs[NUM_RESOURCES]; 1162 const char *rs[NUM_RESOURCES];
1139 /* command input buffering */ 1163 /* command input buffering */
1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1164 char *cmdbuf_ptr, *cmdbuf_endp;
1141 unsigned char cmdbuf_base[CBUFSIZ]; 1165 char cmdbuf_base[CBUFSIZ];
1142 1166
1143 rxvt_salloc *talloc; // text line allocator 1167 rxvt_salloc *talloc; // text line allocator
1144 rxvt_salloc *ralloc; // rend line allocator 1168 rxvt_salloc *ralloc; // rend line allocator
1145 1169
1146 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1170 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1155 void iso14755_54 (int x, int y); 1179 void iso14755_54 (int x, int y);
1156# endif 1180# endif
1157#endif 1181#endif
1158 1182
1159 // modifies first argument(!) 1183 // modifies first argument(!)
1160 void paste (unsigned char *data, unsigned int len); 1184 void paste (char *data, unsigned int len);
1161 1185
1162 void flush (); 1186 void flush ();
1163 1187
1164#if TRANSPARENT 1188#if TRANSPARENT
1165 void rootwin_cb (XEvent &xev); 1189 void rootwin_cb (XEvent &xev);
… …
1206 void pointer_blank (); 1230 void pointer_blank ();
1207#endif 1231#endif
1208 void pointer_unblank (); 1232 void pointer_unblank ();
1209 1233
1210 void tt_printf (const char *fmt,...); 1234 void tt_printf (const char *fmt,...);
1211 void tt_write (const unsigned char *data, unsigned int len); 1235 void tt_write (const char *data, unsigned int len);
1212 void pty_write (); 1236 void pty_write ();
1213 1237
1214 void tt_winch (); 1238 void tt_winch ();
1215 1239
1216 rxvt_term (); 1240 rxvt_term ();
… …
1268 1292
1269 /* autoconvert */ 1293 /* autoconvert */
1270 1294
1271 // command.C 1295 // command.C
1272 void lookup_key (XKeyEvent &ev); 1296 void lookup_key (XKeyEvent &ev);
1273 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1297 unsigned int cmd_write (const char *str, unsigned int count);
1274 1298
1275 unicode_t next_char (); 1299 wchar_t next_char ();
1276 unicode_t cmd_getc (); 1300 wchar_t cmd_getc ();
1277 unicode_t next_octet (); 1301 uint32_t next_octet ();
1278 unicode_t cmd_get8 (); 1302 uint32_t cmd_get8 ();
1279 1303
1280 bool cmd_parse (); 1304 bool cmd_parse ();
1281 void mouse_report (XButtonEvent &ev); 1305 void mouse_report (XButtonEvent &ev);
1282 void button_press (XButtonEvent &ev); 1306 void button_press (XButtonEvent &ev);
1283 void button_release (XButtonEvent &ev); 1307 void button_release (XButtonEvent &ev);
… …
1292 void process_nonprinting (unicode_t ch); 1316 void process_nonprinting (unicode_t ch);
1293 void process_escape_vt52 (unicode_t ch); 1317 void process_escape_vt52 (unicode_t ch);
1294 void process_escape_seq (); 1318 void process_escape_seq ();
1295 void process_csi_seq (); 1319 void process_csi_seq ();
1296 void process_window_ops (const int *args, unsigned int nargs); 1320 void process_window_ops (const int *args, unsigned int nargs);
1297 unsigned char *get_to_st (unicode_t &ends_how); 1321 char *get_to_st (unicode_t &ends_how);
1298 void process_dcs_seq (); 1322 void process_dcs_seq ();
1299 void process_osc_seq (); 1323 void process_osc_seq ();
1300 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1324 void process_color_seq (int report, int color, const char *str, char resp);
1301 void process_xterm_seq (int op, const char *str, unsigned char resp); 1325 void process_xterm_seq (int op, const char *str, char resp);
1302 int privcases (int mode, unsigned long bit); 1326 int privcases (int mode, unsigned long bit);
1303 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1327 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1304 void process_sgr_mode (unsigned int nargs, const int *arg); 1328 void process_sgr_mode (unsigned int nargs, const int *arg);
1305 void process_graphics (); 1329 void process_graphics ();
1306 // init.C 1330 // init.C
… …
1429 void scr_touch (bool refresh); 1453 void scr_touch (bool refresh);
1430 void scr_expose (int x, int y, int width, int height, bool refresh); 1454 void scr_expose (int x, int y, int width, int height, bool refresh);
1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1455 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1432 void scr_recolour (); 1456 void scr_recolour ();
1433 void scr_remap_chars (); 1457 void scr_remap_chars ();
1434 void scr_remap_chars (const line_t &l); 1458 void scr_remap_chars (line_t &l);
1435 1459
1436 void scr_poweron (); 1460 void scr_poweron ();
1437 void scr_cursor (int mode); 1461 void scr_cursor (int mode);
1438 void scr_do_wrap (); 1462 void scr_do_wrap ();
1439 int scr_change_screen (int scrn); 1463 int scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1464 void scr_color (unsigned int color, int fgbg);
1441 void scr_rendition (int set, int style); 1465 void scr_rendition (int set, int style);
1442 void scr_add_lines (const unicode_t *str, int nlines, int len); 1466 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1443 void scr_backspace (); 1467 void scr_backspace ();
1444 void scr_tab (int count, bool ht = false); 1468 void scr_tab (int count, bool ht = false);
1445 void scr_gotorc (int row, int col, int relative); 1469 void scr_gotorc (int row, int col, int relative);
1446 void scr_index (enum page_dirn direction); 1470 void scr_index (enum page_dirn direction);
1447 void scr_erase_line (int mode); 1471 void scr_erase_line (int mode);

Diff Legend

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