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.185 by root, Wed Jan 4 02:37:30 2006 UTC vs.
Revision 1.186 by root, Wed Jan 4 04:42:45 2006 UTC

… …
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))
… …
712#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 696#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
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
718#define TermWin_TotalWidth() ((int32_t)this->width)
719#define TermWin_TotalHeight() ((int32_t)this->height)
720 701
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)
… …
1095 bar_t *CurrentBar; 1076 bar_t *CurrentBar;
1096# if ! (MENUBAR_MAX > 1) 1077# if ! (MENUBAR_MAX > 1)
1097 bar_t BarList; 1078 bar_t BarList;
1098# endif /* (MENUBAR_MAX > 1) */ 1079# endif /* (MENUBAR_MAX > 1) */
1099#endif 1080#endif
1100#ifdef CURSOR_BLINK
1101 struct timeval lastcursorchange;
1102#endif
1103#ifdef POINTER_BLANK
1104 struct timeval lastmotion;
1105#endif
1106 1081
1107#if ENABLE_OVERLAY 1082#if ENABLE_OVERLAY
1108 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1083 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109 text_t **ov_text; 1084 text_t **ov_text;
1110 rend_t **ov_rend; 1085 rend_t **ov_rend;
… …
1125 char *env_display; /* environmental variable DISPLAY */ 1100 char *env_display; /* environmental variable DISPLAY */
1126 char *env_term; /* environmental variable TERM */ 1101 char *env_term; /* environmental variable TERM */
1127 char *env_colorfgbg; 1102 char *env_colorfgbg;
1128 char *locale; 1103 char *locale;
1129 char charsets[4]; 1104 char charsets[4];
1130 unsigned char *v_buffer; /* pointer to physical buffer */ 1105 char *v_buffer; /* pointer to physical buffer */
1131 unsigned int v_buflen; /* size of area to write */ 1106 unsigned int v_buflen; /* size of area to write */
1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1107 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133 1108
1134#ifdef KEYSYM_RESOURCE 1109#ifdef KEYSYM_RESOURCE
1135 keyboard_manager *keyboard; 1110 keyboard_manager *keyboard;
1136#endif 1111#endif
1137 1112
1138 const char *rs[NUM_RESOURCES]; 1113 const char *rs[NUM_RESOURCES];
1139 /* command input buffering */ 1114 /* command input buffering */
1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1115 char *cmdbuf_ptr, *cmdbuf_endp;
1141 unsigned char cmdbuf_base[CBUFSIZ]; 1116 char cmdbuf_base[CBUFSIZ];
1142 1117
1143 rxvt_salloc *talloc; // text line allocator 1118 rxvt_salloc *talloc; // text line allocator
1144 rxvt_salloc *ralloc; // rend line allocator 1119 rxvt_salloc *ralloc; // rend line allocator
1145 1120
1146 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
… …
1155 void iso14755_54 (int x, int y); 1130 void iso14755_54 (int x, int y);
1156# endif 1131# endif
1157#endif 1132#endif
1158 1133
1159 // modifies first argument(!) 1134 // modifies first argument(!)
1160 void paste (unsigned char *data, unsigned int len); 1135 void paste (char *data, unsigned int len);
1161 1136
1162 void flush (); 1137 void flush ();
1163 1138
1164#if TRANSPARENT 1139#if TRANSPARENT
1165 void rootwin_cb (XEvent &xev); 1140 void rootwin_cb (XEvent &xev);
… …
1206 void pointer_blank (); 1181 void pointer_blank ();
1207#endif 1182#endif
1208 void pointer_unblank (); 1183 void pointer_unblank ();
1209 1184
1210 void tt_printf (const char *fmt,...); 1185 void tt_printf (const char *fmt,...);
1211 void tt_write (const unsigned char *data, unsigned int len); 1186 void tt_write (const char *data, unsigned int len);
1212 void pty_write (); 1187 void pty_write ();
1213 1188
1214 void tt_winch (); 1189 void tt_winch ();
1215 1190
1216 rxvt_term (); 1191 rxvt_term ();
… …
1268 1243
1269 /* autoconvert */ 1244 /* autoconvert */
1270 1245
1271 // command.C 1246 // command.C
1272 void lookup_key (XKeyEvent &ev); 1247 void lookup_key (XKeyEvent &ev);
1273 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1248 unsigned int cmd_write (const char *str, unsigned int count);
1274 1249
1275 unicode_t next_char (); 1250 unicode_t next_char ();
1276 unicode_t cmd_getc (); 1251 unicode_t cmd_getc ();
1277 unicode_t next_octet (); 1252 unicode_t next_octet ();
1278 unicode_t cmd_get8 (); 1253 unicode_t cmd_get8 ();
… …
1292 void process_nonprinting (unicode_t ch); 1267 void process_nonprinting (unicode_t ch);
1293 void process_escape_vt52 (unicode_t ch); 1268 void process_escape_vt52 (unicode_t ch);
1294 void process_escape_seq (); 1269 void process_escape_seq ();
1295 void process_csi_seq (); 1270 void process_csi_seq ();
1296 void process_window_ops (const int *args, unsigned int nargs); 1271 void process_window_ops (const int *args, unsigned int nargs);
1297 unsigned char *get_to_st (unicode_t &ends_how); 1272 char *get_to_st (unicode_t &ends_how);
1298 void process_dcs_seq (); 1273 void process_dcs_seq ();
1299 void process_osc_seq (); 1274 void process_osc_seq ();
1300 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);
1301 void process_xterm_seq (int op, const char *str, unsigned char resp); 1276 void process_xterm_seq (int op, const char *str, char resp);
1302 int privcases (int mode, unsigned long bit); 1277 int privcases (int mode, unsigned long bit);
1303 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);
1304 void process_sgr_mode (unsigned int nargs, const int *arg); 1279 void process_sgr_mode (unsigned int nargs, const int *arg);
1305 void process_graphics (); 1280 void process_graphics ();
1306 // init.C 1281 // init.C

Diff Legend

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