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.83 by root, Fri Jul 30 22:36:42 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
559#ifdef OFF_FOCUS_FADING
560 Rs_fade,
561#endif
562#ifdef TINTING
563 Rs_shade,
564#endif
553 NUM_RESOURCES 565 NUM_RESOURCES
554}; 566};
555 567
556// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
557enum { 569enum {
… …
646#define STRLEN(x) strlen((const char *)(x)) 658#define STRLEN(x) strlen((const char *)(x))
647#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 659#define STRCHR(x, y) strchr((const char *)(x), (int)(y))
648#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 660#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y))
649 661
650/* convert pixel dimensions to row/column values. Everything as int32_t */ 662/* convert pixel dimensions to row/column values. Everything as int32_t */
651#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)TermWin.int_bwidth) 663#define Pixel2Col(x) Pixel2Width((int32_t)(x))
652#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)TermWin.int_bwidth) 664#define Pixel2Row(y) Pixel2Height((int32_t)(y))
653#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 665#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
654#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 666#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
655#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)TermWin.int_bwidth) 667#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
656#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)TermWin.int_bwidth) 668#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
657#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 669#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)
658#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 670#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
659 671
660#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 672#define TermWin_TotalWidth() ((int32_t)TermWin.width)
661#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 673#define TermWin_TotalHeight() ((int32_t)TermWin.height)
662 674
663/* how to build & extract colors and attributes */ 675/* how to build & extract colors and attributes */
664#define GET_BASEFG(x) (((x) & RS_fgMask)) 676#define GET_BASEFG(x) (((x) & RS_fgMask))
665#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 677#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
666#ifndef NO_BRIGHTCOLOR 678#ifndef NO_BRIGHTCOLOR
… …
909 hidden_text:1, 921 hidden_text:1,
910#endif 922#endif
911#ifdef POINTER_BLANK 923#ifdef POINTER_BLANK
912 hidden_pointer:1, 924 hidden_pointer:1,
913#endif 925#endif
914 parsed_geometry:1,
915// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 926// enc_utf8:1, /* wether terminal reads/writes utf-8 */
916 seen_input:1; /* wether any input has been seen so far */ 927 parsed_geometry:1;
917 928
918 unsigned char refresh_type, 929 unsigned char refresh_type,
919#ifdef UTMP_SUPPORT 930#ifdef UTMP_SUPPORT
920 next_utmp_action, 931 next_utmp_action,
921#endif 932#endif
… …
937 rend_t rstyle; 948 rend_t rstyle;
938/* ---------- */ 949/* ---------- */
939 uint32_t pixcolor_set[NPIXCLR_SETS]; 950 uint32_t pixcolor_set[NPIXCLR_SETS];
940/* ---------- */ 951/* ---------- */
941#ifdef SELECTION_SCROLLING 952#ifdef SELECTION_SCROLLING
942 int scroll_selection_delay,
943 scroll_selection_lines; 953 int scroll_selection_lines;
944 enum page_dirn scroll_selection_dir; 954 enum page_dirn scroll_selection_dir;
945 int selection_save_x, 955 int selection_save_x,
946 selection_save_y, 956 selection_save_y,
947 selection_save_state, 957 selection_save_state;
948 pending_scroll_selection;
949#endif 958#endif
950/* ---------- */ 959/* ---------- */
951 int csrO, /* Hops - csr offset in thumb/slider to */ 960 int csrO, /* Hops - csr offset in thumb/slider to */
952 /* give proper Scroll behaviour */ 961 /* 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) 962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
957 mouse_slip_wheel_delay,
958 mouse_slip_wheel_speed, 963 mouse_slip_wheel_speed,
959#endif 964#endif
960 refresh_count, 965 refresh_count,
961 refresh_limit, 966 refresh_limit,
962 fnum, /* logical font number */ 967 fnum, /* logical font number */
… …
1141#endif 1146#endif
1142#ifdef TEXT_BLINK 1147#ifdef TEXT_BLINK
1143 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1148 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1144#endif 1149#endif
1145 1150
1151#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1152 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1153#endif
1154#ifdef SELECTION_SCROLLING
1155 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev;
1156#endif
1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1158 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev;
1159#endif
1160
1146#ifdef POINTER_BLANK 1161#ifdef POINTER_BLANK
1147 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1162 void pointer_cb (time_watcher &w); time_watcher pointer_ev;
1148 void pointer_blank (); 1163 void pointer_blank ();
1164#endif
1149 void pointer_unblank (); 1165 void pointer_unblank ();
1150#endif
1151 1166
1152 void tt_printf (const char *fmt,...); 1167 void tt_printf (const char *fmt,...);
1153 void tt_write (const unsigned char *data, unsigned int len); 1168 void tt_write (const unsigned char *data, unsigned int len);
1154 1169
1155 void tt_winch (); 1170 void tt_winch ();
… …
1158 ~rxvt_term (); 1173 ~rxvt_term ();
1159 void destroy (); 1174 void destroy ();
1160 1175
1161 bool init (int argc, const char *const *argv); 1176 bool init (int argc, const char *const *argv);
1162 bool init_vars (); 1177 bool init_vars ();
1163
1164 unicode_t next_char ();
1165 1178
1166 bool pty_fill (); 1179 bool pty_fill ();
1167 1180
1168 void *operator new (size_t s); 1181 void *operator new (size_t s);
1169 void operator delete (void *p, size_t s); 1182 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); 1224 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); 1225 int scr_scroll_text (int row1, int row2, int count, int spec);
1213 void scr_reset (); 1226 void scr_reset ();
1214 void scr_reset_realloc (); 1227 void scr_reset_realloc ();
1215 void scr_release (); 1228 void scr_release ();
1216 void scr_clear (bool really = true); 1229 void scr_clear (bool really = false);
1217 void scr_refresh (unsigned char refresh_type); 1230 void scr_refresh (unsigned char refresh_type);
1218 bool scr_refresh_rend (rend_t mask, rend_t value); 1231 bool scr_refresh_rend (rend_t mask, rend_t value);
1219 void scr_erase_screen (int mode); 1232 void scr_erase_screen (int mode);
1220 void scr_touch (bool refresh); 1233 void scr_touch (bool refresh);
1221 void scr_expose (int x, int y, int width, int height, bool refresh); 1234 void scr_expose (int x, int y, int width, int height, bool refresh);
… …
1225 /* autoconvert */ 1238 /* autoconvert */
1226 1239
1227 // command.C 1240 // command.C
1228 void lookup_key (XKeyEvent &ev); 1241 void lookup_key (XKeyEvent &ev);
1229 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1242 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1243
1244 unicode_t next_char ();
1230 unicode_t cmd_getc (); 1245 unicode_t cmd_getc ();
1246 unicode_t next_octet ();
1247 unicode_t cmd_get8 ();
1248
1231 bool cmd_parse (); 1249 bool cmd_parse ();
1232 void mouse_report (XButtonEvent &ev); 1250 void mouse_report (XButtonEvent &ev);
1233 void button_press (XButtonEvent &ev); 1251 void button_press (XButtonEvent &ev);
1234 void button_release (XButtonEvent &ev); 1252 void button_release (XButtonEvent &ev);
1235 int check_our_parents (); 1253 int check_our_parents ();

Diff Legend

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