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.343 by ayin, Sat Dec 29 12:36:56 2007 UTC vs.
Revision 1.371 by root, Tue Nov 4 22:44:09 2008 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
209 ***************************************************************************** 200 *****************************************************************************
210 * STRUCTURES AND TYPEDEFS 201 * STRUCTURES AND TYPEDEFS
211 ***************************************************************************** 202 *****************************************************************************
212 */ 203 */
213 204
214/* If we're using either the rxvt scrollbar, keep the
215 * scrollColor resource.
216 */
217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
218# define KEEP_SCROLLCOLOR 1
219#else
220# undef KEEP_SCROLLCOLOR
221#endif
222
223/* 205/*
224 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
225 * pared down from XButtonEvent 207 * pared down from XButtonEvent
226 */ 208 */
227struct mouse_event { 209struct mouse_event {
… …
277# define NO_MOUSE_REPORT_SCROLLBAR 1 259# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 260#endif
279 261
280#define scrollBar_esc 30 262#define scrollBar_esc 30
281 263
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 264#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
283# define HAVE_SCROLLBARS 1 265# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
284#endif 266#endif
285 267
286enum { 268enum {
287 NO_REFRESH = 0, /* Window not visible at all! */ 269 NO_REFRESH = 0, /* Window not visible at all! */
288 FAST_REFRESH = 1, /* Fully exposed window */ 270 FAST_REFRESH = 1, /* Fully exposed window */
… …
394 XTerm_name = 0, 376 XTerm_name = 0,
395 XTerm_iconName = 1, 377 XTerm_iconName = 1,
396 XTerm_title = 2, 378 XTerm_title = 2,
397 XTerm_property = 3, // change X property 379 XTerm_property = 3, // change X property
398 XTerm_Color = 4, // change colors 380 XTerm_Color = 4, // change colors
399 XTerm_Color00 = 10, // not implemented, CLASH! 381 XTerm_Color00 = 10, // change fg color
400 XTerm_Color01 = 11, // not implemented 382 XTerm_Color01 = 11, // change bg color
401 XTerm_Color_cursor = 12, // change actual 'Cursor' color 383 XTerm_Color_cursor = 12, // change actual 'Cursor' color
402 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 384 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
403 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 385 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
404 XTerm_Color05 = 15, // not implemented (tektronix fg) 386 XTerm_Color05 = 15, // not implemented (tektronix fg)
405 XTerm_Color06 = 16, // not implemented (tektronix bg) 387 XTerm_Color06 = 16, // not implemented (tektronix bg)
… …
410 XTerm_konsole30 = 30, // reserved for konsole 392 XTerm_konsole30 = 30, // reserved for konsole
411 XTerm_konsole31 = 31, // reserved for konsole 393 XTerm_konsole31 = 31, // reserved for konsole
412 XTerm_emacs51 = 51, // reserved for emacs shell 394 XTerm_emacs51 = 51, // reserved for emacs shell
413 /* 395 /*
414 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 396 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
415 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
416 */ 397 */
417 Rxvt_Color_BD = 18, // change actual 'Bold' color 398
418 Rxvt_Color_UL = 19, // change actual 'Underline' color 399 // deprecated
400 Rxvt_Color_BD = 18,
401 Rxvt_Color_UL = 19,
402 Rxvt_restoreFG = 39,
403 Rxvt_restoreBG = 49,
404
419 Rxvt_Pixmap = 20, // new bg pixmap 405 Rxvt_Pixmap = 20, // new bg pixmap
420 Rxvt_restoreFG = 39, // change default fg color
421 Rxvt_restoreBG = 49, // change default bg color
422 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 406 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
423 407
424 URxvt_locale = 701, // change locale 408 URxvt_locale = 701, // change locale
425 URxvt_version = 702, // request version 409 URxvt_version = 702, // request version
426 410
427 URxvt_Color_IT = 704, // change actual 'Italic' colour 411 URxvt_Color_IT = 704, // change actual 'Italic' colour
428 URxvt_Color_tint = 705, // change actual tint colour 412 URxvt_Color_tint = 705, // change actual tint colour
429 URxvt_Color_BD = 706, 413 URxvt_Color_BD = 706, // change actual 'Bold' color
430 URxvt_Color_UL = 707, 414 URxvt_Color_UL = 707, // change actual 'Underline' color
431 415
432 URxvt_font = 710, 416 URxvt_font = 710,
433 URxvt_boldFont = 711, 417 URxvt_boldFont = 711,
434 URxvt_italicFont = 712, 418 URxvt_italicFont = 712,
435 URxvt_boldItalicFont = 713, 419 URxvt_boldItalicFont = 713,
436 420
437 URxvt_view_up = 720, 421 URxvt_view_up = 720,
438 URxvt_view_down = 721, 422 URxvt_view_down = 721,
439 423
440 URxvt_perl = 777, 424 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
441}; 425};
442 426
443/* Words starting with `Color_' are colours. Others are counts */ 427/* Words starting with `Color_' are colours. Others are counts */
444/* 428/*
445 * The PixColor and rendition colour usage should probably be decoupled 429 * The PixColor and rendition colour usage should probably be decoupled
… …
495 Color_underline, 479 Color_underline,
496#endif 480#endif
497#ifdef OPTION_HC 481#ifdef OPTION_HC
498 Color_HC, 482 Color_HC,
499#endif 483#endif
500#ifdef KEEP_SCROLLCOLOR
501 Color_scroll, 484 Color_scroll,
485#ifdef RXVT_SCROLLBAR
502 Color_trough, 486 Color_trough,
503#endif 487#endif
504#if ENABLE_TRANSPARENCY 488#if ENABLE_TRANSPARENCY
505 Color_tint, 489 Color_tint,
506#endif 490#endif
507#if OFF_FOCUS_FADING 491#if OFF_FOCUS_FADING
508 Color_fade, 492 Color_fade,
509#endif 493#endif
510 NRS_COLORS, /* */ 494 NRS_COLORS, /* */
511#ifdef KEEP_SCROLLCOLOR 495#ifdef RXVT_SCROLLBAR
512 Color_topShadow = NRS_COLORS, 496 Color_topShadow = NRS_COLORS,
513 Color_bottomShadow, 497 Color_bottomShadow,
514 TOTAL_COLORS 498 TOTAL_COLORS
515#else 499#else
516 TOTAL_COLORS = NRS_COLORS 500 TOTAL_COLORS = NRS_COLORS
… …
552#define PrivMode_smoothScroll (1UL<<17) 536#define PrivMode_smoothScroll (1UL<<17)
553#define PrivMode_vt52 (1UL<<18) 537#define PrivMode_vt52 (1UL<<18)
554#define PrivMode_LFNL (1UL<<19) 538#define PrivMode_LFNL (1UL<<19)
555#define PrivMode_MouseBtnEvent (1UL<<20) 539#define PrivMode_MouseBtnEvent (1UL<<20)
556#define PrivMode_MouseAnyEvent (1UL<<21) 540#define PrivMode_MouseAnyEvent (1UL<<21)
541#define PrivMode_BracketPaste (1UL<<22)
557 542
558#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 543#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
559 544
560#ifdef ALLOW_132_MODE 545#ifdef ALLOW_132_MODE
561# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 546# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
565 550
566// do not change these constants lightly, there are many interdependencies 551// do not change these constants lightly, there are many interdependencies
567#define IMBUFSIZ 128 // input modifier buffer sizes 552#define IMBUFSIZ 128 // input modifier buffer sizes
568#define KBUFSZ 512 // size of keyboard mapping buffer 553#define KBUFSZ 512 // size of keyboard mapping buffer
569#define CBUFSIZ 2048 // size of command buffer 554#define CBUFSIZ 2048 // size of command buffer
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
570#define UBUFSIZ 2048 // character buffer 556#define UBUFSIZ 2048 // character buffer
571 557
572#if ENABLE_FRILLS 558#if ENABLE_FRILLS
573# include <X11/Xmd.h> 559# include <X11/Xmd.h>
574typedef struct _mwmhints { 560typedef struct _mwmhints {
… …
657 643
658#if ENABLE_STYLES 644#if ENABLE_STYLES
659# define FONTSET(style) fontset[GET_STYLE (style)] 645# define FONTSET(style) fontset[GET_STYLE (style)]
660#else 646#else
661# define FONTSET(style) fontset[0] 647# define FONTSET(style) fontset[0]
662#endif
663
664#ifdef HAVE_SCROLLBARS
665# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
666#else
667# define scrollbar_TotalWidth() (0)
668#endif 648#endif
669 649
670typedef callback<void (const char *)> log_callback; 650typedef callback<void (const char *)> log_callback;
671typedef callback<int (int)> getfd_callback; 651typedef callback<int (int)> getfd_callback;
672 652
… …
822 * +------------+·display·+·= term_start 802 * +------------+·display·+·= term_start
823 * | terminal | display | 803 * | terminal | display |
824 * | terminal +---------+ 804 * | terminal +---------+
825 * | terminal | 805 * | terminal |
826 * | terminal | 806 * | terminal |
827 * +------------+···········= term_stat + nrow - 1 807 * +------------+···········= term_start + nrow - 1
828 * | 808 * |
829 * | 809 * |
830 * END······················= total_rows 810 * END······················= total_rows
831 */ 811 */
832 812
… …
868 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 848 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
869 * nothing is selected 849 * nothing is selected
870 * beg: row/column of beginning of selection : never past mark 850 * beg: row/column of beginning of selection : never past mark
871 * mark: row/column of initial click : never past end 851 * mark: row/column of initial click : never past end
872 * end: row/column of one character past end of selection 852 * end: row/column of one character past end of selection
873 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
874 * * Note: col == -1 ==> we're left of screen 854 * * Note: col == -1 ==> we're left of screen
875 * 855 *
876 */ 856 */
877typedef struct { 857typedef struct {
878 row_col_t cur; /* cursor position on the screen */ 858 row_col_t cur; /* cursor position on the screen */
… …
932 scrollBar_t scrollBar; 912 scrollBar_t scrollBar;
933 uint8_t options[(Opt_count + 7) >> 3]; 913 uint8_t options[(Opt_count + 7) >> 3];
934 XSizeHints szHint; 914 XSizeHints szHint;
935 rxvt_color *pix_colors; 915 rxvt_color *pix_colors;
936 Cursor TermWin_cursor; /* cursor for vt window */ 916 Cursor TermWin_cursor; /* cursor for vt window */
937 int sb_shadow; /* scrollbar shadow width */
938 int numlock_state; 917 int numlock_state;
939 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 918 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
940 line_t *drawn_buf; // text on screen 919 line_t *drawn_buf; // text on screen
941 line_t *swap_buf; // lines for swap buffer 920 line_t *swap_buf; // lines for swap buffer
942 char *tabs; /* per location: 1 == tab-stop */ 921 char *tabs; /* per location: 1 == tab-stop */
… …
965 944
966 unsigned char want_refresh:1, 945 unsigned char want_refresh:1,
967 current_screen:1, /* primary or secondary */ 946 current_screen:1, /* primary or secondary */
968 num_scr_allow:1, 947 num_scr_allow:1,
969 bypass_keystate:1, 948 bypass_keystate:1,
949#ifdef ENABLE_FRILLS
950 urgency_hint:1,
951#endif
970#ifdef CURSOR_BLINK 952#ifdef CURSOR_BLINK
971 hidden_cursor:1, 953 hidden_cursor:1,
972#endif 954#endif
973#ifdef TEXT_BLINK 955#ifdef TEXT_BLINK
974 hidden_text:1, 956 hidden_text:1,
… …
983 965
984 unsigned char refresh_type, 966 unsigned char refresh_type,
985#ifdef META8_OPTION 967#ifdef META8_OPTION
986 meta_char, /* Alt-key prefix */ 968 meta_char, /* Alt-key prefix */
987#endif 969#endif
988 scrollbar_align,
989 selection_wait, 970 selection_wait,
990 selection_type; 971 selection_type;
991/* ---------- */ 972/* ---------- */
992 bool rvideo_state, rvideo_mode; 973 bool rvideo_state, rvideo_mode;
993#ifndef NO_BELL 974#ifndef NO_BELL
… …
1011 /* give proper Scroll behaviour */ 992 /* give proper Scroll behaviour */
1012#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1013 mouse_slip_wheel_speed, 994 mouse_slip_wheel_speed,
1014#endif 995#endif
1015 refresh_count, 996 refresh_count,
1016 last_bot, /* scrollbar last bottom position */
1017 last_top, /* scrollbar last top position */
1018 last_state, /* scrollbar last state */
1019 scrollbar_len,
1020 window_vt_x, 997 window_vt_x,
1021 window_vt_y, 998 window_vt_y,
1022 window_sb_x,
1023 mouse_row, 999 mouse_row,
1024 mouse_col, 1000 mouse_col,
1025# ifdef POINTER_BLANK 1001# ifdef POINTER_BLANK
1026 pointerBlankDelay, 1002 pointerBlankDelay,
1027# endif 1003# endif
… …
1035 unsigned long priv_modes, 1011 unsigned long priv_modes,
1036 SavedModes; 1012 SavedModes;
1037/* ---------- */ 1013/* ---------- */
1038 Atom *xa; 1014 Atom *xa;
1039/* ---------- */ 1015/* ---------- */
1040#ifdef RXVT_SCROLLBAR
1041 GC scrollbarGC,
1042 topShadowGC,
1043 botShadowGC;
1044#endif
1045#ifdef XTERM_SCROLLBAR
1046 GC xscrollbarGC,
1047 ShadowGC;
1048#endif
1049#ifdef PLAIN_SCROLLBAR
1050 GC pscrollbarGC;
1051#endif
1052#ifdef NEXT_SCROLLBAR
1053 GC blackGC,
1054 whiteGC,
1055 grayGC,
1056 darkGC,
1057 stippleGC;
1058 Pixmap dimple,
1059 upArrow,
1060 downArrow,
1061 upArrowHi,
1062 downArrowHi;
1063#endif
1064/* ---------- */
1065 Time selection_time, 1016 Time selection_time,
1066 selection_request_time; 1017 selection_request_time;
1067 pid_t cmd_pid; /* process id of child */ 1018 pid_t cmd_pid; /* process id of child */
1068 char * incr_buf; 1019 char * incr_buf;
1069 size_t incr_buf_size, incr_buf_fill; 1020 size_t incr_buf_size, incr_buf_fill;
1070/* ---------- */
1071 Cursor leftptr_cursor;
1072/* ---------- */ 1021/* ---------- */
1073 struct mouse_event MEvent; 1022 struct mouse_event MEvent;
1074 XComposeStatus compose; 1023 XComposeStatus compose;
1075 struct termios tio; 1024 struct termios tio;
1076 row_col_t oldcursor; 1025 row_col_t oldcursor;
… …
1078 bgPixmap_t bgPixmap; 1027 bgPixmap_t bgPixmap;
1079#endif 1028#endif
1080#ifdef HAVE_AFTERIMAGE 1029#ifdef HAVE_AFTERIMAGE
1081 ASVisual *asv; 1030 ASVisual *asv;
1082 ASImageManager *asimman; 1031 ASImageManager *asimman;
1032
1033 void init_asv ()
1034 {
1035 if (!asv)
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 }
1083#endif 1038#endif
1084 1039
1085#if ENABLE_OVERLAY 1040#if ENABLE_OVERLAY
1086 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1087 text_t **ov_text; 1042 text_t **ov_text;
… …
1131 1086
1132#if ENABLE_FRILLS || ISO_14755 1087#if ENABLE_FRILLS || ISO_14755
1133 // ISO 14755 entry support 1088 // ISO 14755 entry support
1134 unicode_t iso14755buf; 1089 unicode_t iso14755buf;
1135 void commit_iso14755 (); 1090 void commit_iso14755 ();
1136 int hex_keyval (XKeyEvent &ev);
1137# if ISO_14755 1091# if ISO_14755
1138 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1092 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1139 void iso14755_54 (int x, int y); 1093 void iso14755_54 (int x, int y);
1140# endif 1094# endif
1141#endif 1095#endif
… …
1162#endif 1116#endif
1163 1117
1164 void x_cb (XEvent &xev); 1118 void x_cb (XEvent &xev);
1165 xevent_watcher termwin_ev; 1119 xevent_watcher termwin_ev;
1166 xevent_watcher vt_ev; 1120 xevent_watcher vt_ev;
1167#ifdef HAVE_SCROLLBARS
1168 xevent_watcher scrollbar_ev; 1121 xevent_watcher scrollbar_ev;
1169#endif
1170 1122
1171 void child_cb (ev::child &w, int revents); ev::child child_ev; 1123 void child_cb (ev::child &w, int revents); ev::child child_ev;
1172 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1124 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1173 void refresh_check (); 1125 void refresh_check ();
1174 void flush (); 1126 void flush ();
… …
1247 wchar_t next_char () NOTHROW; 1199 wchar_t next_char () NOTHROW;
1248 wchar_t cmd_getc () THROW ((class out_of_input)); 1200 wchar_t cmd_getc () THROW ((class out_of_input));
1249 uint32_t next_octet () NOTHROW; 1201 uint32_t next_octet () NOTHROW;
1250 uint32_t cmd_get8 () THROW ((class out_of_input)); 1202 uint32_t cmd_get8 () THROW ((class out_of_input));
1251 1203
1252 bool cmd_parse (); 1204 void cmd_parse ();
1253 void mouse_report (XButtonEvent &ev); 1205 void mouse_report (XButtonEvent &ev);
1254 void button_press (XButtonEvent &ev); 1206 void button_press (XButtonEvent &ev);
1255 void button_release (XButtonEvent &ev); 1207 void button_release (XButtonEvent &ev);
1256 void focus_in (); 1208 void focus_in ();
1257 void focus_out (); 1209 void focus_out ();
1210 void set_urgency (bool enable);
1258 void update_fade_color (unsigned int idx); 1211 void update_fade_color (unsigned int idx);
1259#ifdef PRINTPIPE 1212#ifdef PRINTPIPE
1260 FILE *popen_printer (); 1213 FILE *popen_printer ();
1261 int pclose_printer (FILE *stream); 1214 int pclose_printer (FILE *stream);
1262#endif 1215#endif
… …
1275 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1276 void process_sgr_mode (unsigned int nargs, const int *arg); 1229 void process_sgr_mode (unsigned int nargs, const int *arg);
1277 void process_graphics (); 1230 void process_graphics ();
1278 // init.C 1231 // init.C
1279 void init_vars (); 1232 void init_vars ();
1280 void init_secondary ();
1281 const char **init_resources (int argc, const char *const *argv); 1233 const char **init_resources (int argc, const char *const *argv);
1234 void init (int argc, const char *const *argv, stringvec *envv);
1282 void init_env (); 1235 void init_env ();
1283 void set_locale (const char *locale); 1236 void set_locale (const char *locale);
1284 void init_xlocale (); 1237 void init_xlocale ();
1285 void init_command (const char *const *argv); 1238 void init_command (const char *const *argv);
1286 void run_command (const char *const *argv); 1239 void run_command (const char *const *argv);
1287 int run_child (const char *const *argv); 1240 int run_child (const char *const *argv);
1288 void color_aliases (int idx); 1241 void color_aliases (int idx);
1289 void create_windows (int argc, const char *const *argv); 1242 void create_windows (int argc, const char *const *argv);
1290 void Get_Colours (); 1243 void get_colours ();
1291 void get_ourmods (); 1244 void get_ourmods ();
1292 // main.C 1245 // main.C
1293 void tt_winch (); 1246 void tt_winch ();
1294 rxvt_term (); 1247 rxvt_term ();
1295 ~rxvt_term (); 1248 ~rxvt_term ();
1296 void destroy (); 1249 void destroy ();
1297 void emergency_cleanup (); 1250 void emergency_cleanup ();
1298 void init (int argc, const char *const *argv, stringvec *envv);
1299 void recolour_cursor (); 1251 void recolour_cursor ();
1300 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1252 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1301 void window_calc (unsigned int newwidth, unsigned int newheight); 1253 void window_calc (unsigned int newwidth, unsigned int newheight);
1302 bool set_fonts (); 1254 bool set_fonts ();
1303 void set_string_property (Atom prop, const char *str, int len = -1); 1255 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1389 options[opt >> 3] |= (1 << (opt & 7)); 1341 options[opt >> 3] |= (1 << (opt & 7));
1390 else 1342 else
1391 options[opt >> 3] &= ~(1 << (opt & 7)); 1343 options[opt >> 3] &= ~(1 << (opt & 7));
1392 } 1344 }
1393 1345
1394 void PrivMode (int set, unsigned bit) NOTHROW 1346 void set_privmode (unsigned bit, int set) NOTHROW
1395 { 1347 {
1396 if (set) 1348 if (set)
1397 priv_modes |= bit; 1349 priv_modes |= bit;
1398 else 1350 else
1399 priv_modes &= ~bit; 1351 priv_modes &= ~bit;
… …
1401 1353
1402 // modifies first argument(!) 1354 // modifies first argument(!)
1403 void paste (char *data, unsigned int len) NOTHROW; 1355 void paste (char *data, unsigned int len) NOTHROW;
1404 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1356 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1405 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1357 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1358 void scr_kill_char (line_t &l, int col) const NOTHROW;
1406 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1359 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1407 void scr_reset (); 1360 void scr_reset ();
1408 void scr_release () NOTHROW; 1361 void scr_release () NOTHROW;
1409 void scr_clear (bool really = false) NOTHROW; 1362 void scr_clear (bool really = false) NOTHROW;
1410 void scr_refresh () NOTHROW; 1363 void scr_refresh () NOTHROW;
… …
1422 void scr_remap_chars (line_t &l) NOTHROW; 1375 void scr_remap_chars (line_t &l) NOTHROW;
1423 1376
1424 enum cursor_mode { SAVE, RESTORE }; 1377 enum cursor_mode { SAVE, RESTORE };
1425 1378
1426 void scr_poweron (); 1379 void scr_poweron ();
1380 void scr_soft_reset () NOTHROW;
1427 void scr_cursor (cursor_mode mode) NOTHROW; 1381 void scr_cursor (cursor_mode mode) NOTHROW;
1428 void scr_do_wrap () NOTHROW; 1382 void scr_do_wrap () NOTHROW;
1429 void scr_swap_screen () NOTHROW; 1383 void scr_swap_screen () NOTHROW;
1430 void scr_change_screen (int scrn); 1384 void scr_change_screen (int scrn);
1431 void scr_color (unsigned int color, int fgbg) NOTHROW; 1385 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1475 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1429 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1476 void selection_click (int clicks, int x, int y) NOTHROW; 1430 void selection_click (int clicks, int x, int y) NOTHROW;
1477 void selection_extend (int x, int y, int flag) NOTHROW; 1431 void selection_extend (int x, int y, int flag) NOTHROW;
1478 void selection_rotate (int x, int y) NOTHROW; 1432 void selection_rotate (int x, int y) NOTHROW;
1479 1433
1480#if defined(NEXT_SCROLLBAR)
1481 // scrollbar-next.C
1482 Pixmap renderPixmap (const char *const *data, int width, int height);
1483 void init_scrollbar_stuff ();
1484 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1485 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1486#endif
1487
1488#if defined(RXVT_SCROLLBAR)
1489 // scrollbar-rxvt.C
1490 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1491#endif
1492
1493#if defined(XTERM_SCROLLBAR)
1494 // scrollbar-xterm.C
1495 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1496#endif
1497
1498#if defined(PLAIN_SCROLLBAR)
1499 // scrollbar-plain.C
1500 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1501#endif
1502
1503 // scrollbar.C
1504 void resize_scrollbar ();
1505 int scrollbar_mapping (int map);
1506 int scrollbar_show (int update);
1507 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1508
1509 // xdefaults.C 1434 // xdefaults.C
1510 void get_options (int argc, const char *const *argv); 1435 void get_options (int argc, const char *const *argv);
1511 int parse_keysym (const char *str, const char *arg); 1436 int parse_keysym (const char *str, const char *arg);
1512 const char *x_resource (const char *name); 1437 const char *x_resource (const char *name);
1513 void extract_resources (); 1438 void extract_resources ();

Diff Legend

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