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.69 by pcg, Fri Apr 2 20:41:01 2004 UTC vs.
Revision 1.78 by root, Mon Jul 26 18:01:19 2004 UTC

… …
266enum { 266enum {
267 NO_REFRESH = 0 , /* Window not visible at all! */ 267 NO_REFRESH = 0 , /* Window not visible at all! */
268 FAST_REFRESH = 1<<0, /* Fully exposed window */ 268 FAST_REFRESH = 1<<0, /* Fully exposed window */
269 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 269 SLOW_REFRESH = 1<<1, /* Partially exposed window */
270 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ 270 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
271#if 0
271 REFRESH_BOUNDS = 1<<3 272 REFRESH_BOUNDS = 1<<3
273#endif
274 REFRESH_BOUNDS = 0 /* only required for old int_bwidth code. */ //TODO: remove this and all depending code
272}; 275};
273 276
274#ifdef NO_SECONDARY_SCREEN 277#ifdef NO_SECONDARY_SCREEN
275# define NSCREENS 0 278# define NSCREENS 0
276#else 279#else
… …
548 Rs_imLocale, 551 Rs_imLocale,
549#ifndef NO_SECONDARY_SCREEN 552#ifndef NO_SECONDARY_SCREEN
550 Rs_secondaryScreen, 553 Rs_secondaryScreen,
551 Rs_secondaryScroll, 554 Rs_secondaryScroll,
552#endif 555#endif
556#ifndef NO_BOLD_UNDERLINE_REVERSE
557 Rs_realBold,
558#endif
553 NUM_RESOURCES 559 NUM_RESOURCES
554}; 560};
555 561
556// see init.C:xa_names, which must be kept in sync 562// see init.C:xa_names, which must be kept in sync
557enum { 563enum {
… …
646#define STRLEN(x) strlen((const char *)(x)) 652#define STRLEN(x) strlen((const char *)(x))
647#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 653#define STRCHR(x, y) strchr((const char *)(x), (int)(y))
648#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 654#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y))
649 655
650/* convert pixel dimensions to row/column values. Everything as int32_t */ 656/* convert pixel dimensions to row/column values. Everything as int32_t */
651#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)TermWin.int_bwidth) 657#define Pixel2Col(x) Pixel2Width((int32_t)(x))
652#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)TermWin.int_bwidth) 658#define Pixel2Row(y) Pixel2Height((int32_t)(y))
653#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 659#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
654#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 660#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
655#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)TermWin.int_bwidth) 661#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
656#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)TermWin.int_bwidth) 662#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
657#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 663#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)
658#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 664#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
659 665
660#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 666#define TermWin_TotalWidth() ((int32_t)TermWin.width)
661#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 667#define TermWin_TotalHeight() ((int32_t)TermWin.height)
662 668
663/* how to build & extract colors and attributes */ 669/* how to build & extract colors and attributes */
664#define GET_BASEFG(x) (((x) & RS_fgMask)) 670#define GET_BASEFG(x) (((x) & RS_fgMask))
665#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 671#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
666#ifndef NO_BRIGHTCOLOR 672#ifndef NO_BRIGHTCOLOR
… …
909 hidden_text:1, 915 hidden_text:1,
910#endif 916#endif
911#ifdef POINTER_BLANK 917#ifdef POINTER_BLANK
912 hidden_pointer:1, 918 hidden_pointer:1,
913#endif 919#endif
914 parsed_geometry:1,
915// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 920// enc_utf8:1, /* wether terminal reads/writes utf-8 */
916 seen_input:1; /* wether any input has been seen so far */ 921 parsed_geometry:1;
917 922
918 unsigned char refresh_type, 923 unsigned char refresh_type,
919#ifdef UTMP_SUPPORT 924#ifdef UTMP_SUPPORT
920 next_utmp_action, 925 next_utmp_action,
921#endif 926#endif
… …
937 rend_t rstyle; 942 rend_t rstyle;
938/* ---------- */ 943/* ---------- */
939 uint32_t pixcolor_set[NPIXCLR_SETS]; 944 uint32_t pixcolor_set[NPIXCLR_SETS];
940/* ---------- */ 945/* ---------- */
941#ifdef SELECTION_SCROLLING 946#ifdef SELECTION_SCROLLING
942 int scroll_selection_delay,
943 scroll_selection_lines; 947 int scroll_selection_lines;
944 enum page_dirn scroll_selection_dir; 948 enum page_dirn scroll_selection_dir;
945 int selection_save_x, 949 int selection_save_x,
946 selection_save_y, 950 selection_save_y,
947 selection_save_state, 951 selection_save_state;
948 pending_scroll_selection;
949#endif 952#endif
950/* ---------- */ 953/* ---------- */
951 int csrO, /* Hops - csr offset in thumb/slider to */ 954 int csrO, /* Hops - csr offset in thumb/slider to */
952 /* give proper Scroll behaviour */ 955 /* give proper Scroll behaviour */
953#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
954 scroll_arrow_delay,
955#endif
956#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 956#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
957 mouse_slip_wheel_delay,
958 mouse_slip_wheel_speed, 957 mouse_slip_wheel_speed,
959#endif 958#endif
960 refresh_count, 959 refresh_count,
961 refresh_limit, 960 refresh_limit,
962 fnum, /* logical font number */ 961 fnum, /* logical font number */
… …
1141#endif 1140#endif
1142#ifdef TEXT_BLINK 1141#ifdef TEXT_BLINK
1143 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1142 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1144#endif 1143#endif
1145 1144
1145#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1146 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1147#endif
1148#ifdef SELECTION_SCROLLING
1149 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev;
1150#endif
1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1152 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev;
1153#endif
1154
1146#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
1147 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1156 void pointer_cb (time_watcher &w); time_watcher pointer_ev;
1148 void pointer_blank (); 1157 void pointer_blank ();
1149 void pointer_unblank (); 1158 void pointer_unblank ();
1150#endif 1159#endif
… …
1158 ~rxvt_term (); 1167 ~rxvt_term ();
1159 void destroy (); 1168 void destroy ();
1160 1169
1161 bool init (int argc, const char *const *argv); 1170 bool init (int argc, const char *const *argv);
1162 bool init_vars (); 1171 bool init_vars ();
1163
1164 unicode_t next_char ();
1165 1172
1166 bool pty_fill (); 1173 bool pty_fill ();
1167 1174
1168 void *operator new (size_t s); 1175 void *operator new (size_t s);
1169 void operator delete (void *p, size_t s); 1176 void operator delete (void *p, size_t s);
… …
1211 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1218 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1212 int scr_scroll_text (int row1, int row2, int count, int spec); 1219 int scr_scroll_text (int row1, int row2, int count, int spec);
1213 void scr_reset (); 1220 void scr_reset ();
1214 void scr_reset_realloc (); 1221 void scr_reset_realloc ();
1215 void scr_release (); 1222 void scr_release ();
1216 void scr_clear (bool really = true); 1223 void scr_clear (bool really = false);
1217 void scr_refresh (unsigned char refresh_type); 1224 void scr_refresh (unsigned char refresh_type);
1218 bool scr_refresh_rend (rend_t mask, rend_t value); 1225 bool scr_refresh_rend (rend_t mask, rend_t value);
1219 void scr_erase_screen (int mode); 1226 void scr_erase_screen (int mode);
1220 void scr_touch (bool refresh); 1227 void scr_touch (bool refresh);
1221 void scr_expose (int x, int y, int width, int height, bool refresh); 1228 void scr_expose (int x, int y, int width, int height, bool refresh);
… …
1225 /* autoconvert */ 1232 /* autoconvert */
1226 1233
1227 // command.C 1234 // command.C
1228 void lookup_key (XKeyEvent &ev); 1235 void lookup_key (XKeyEvent &ev);
1229 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1236 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1237
1238 unicode_t next_char ();
1230 unicode_t cmd_getc (); 1239 unicode_t cmd_getc ();
1240 unicode_t next_octet ();
1241 unicode_t cmd_get8 ();
1242
1231 bool cmd_parse (); 1243 bool cmd_parse ();
1232 void mouse_report (XButtonEvent &ev); 1244 void mouse_report (XButtonEvent &ev);
1233 void button_press (XButtonEvent &ev); 1245 void button_press (XButtonEvent &ev);
1234 void button_release (XButtonEvent &ev); 1246 void button_release (XButtonEvent &ev);
1235 int check_our_parents (); 1247 int check_our_parents ();

Diff Legend

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