ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.427 by root, Wed Nov 5 15:44:04 2008 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
250} 256}
251#endif 257#endif
252 258
253void 259void ecb_cold
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284static int 287static int ecb_cold
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
303static inline KeySym 306static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
305{ 308{
306#ifdef XK_KP_Home 309#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
334# endif 337# endif
335#endif 338#endif
336 return keysym; 339 return keysym;
337} 340}
338 341
339static inline int 342static inline int ecb_cold
340map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
341{ 344{
342 int param = 0; 345 int param = 0;
343 346
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 396 break;
394 } 397 }
395 return param; 398 return param;
396} 399}
397 400
398void 401void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
400{ 403{
401 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
402 KeySym keysym; 405 KeySym keysym;
403 int valid_keysym; 406 int valid_keysym;
… …
416 */ 419 */
417 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
420 423
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#if USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
432 Status status_return; 429 Status status_return;
433 430
434#if 0 431#if 0
… …
505#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 504#else
508 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
509#endif 506#endif
507 max_it (lnsppg, 1);
508
510 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
511 { 510 {
512 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
513 return; 512 return;
514 } 513 }
… …
567 selection_request (ev.time); 566 selection_request (ev.time);
568 return; 567 return;
569#if TODO 568#if TODO
570 /* rxvt extras */ 569 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 571 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 573 return;
577#endif 574#endif
578 } 575 }
579 } 576 }
580 } 577 }
581 578
582#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 580 // ISO 14755 support
584 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 582 {
586 int hv; 583 int hv;
587 584
588 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 616 scr_overlay_off ();
620# endif 617# endif
621 iso14755buf = 0; 618 iso14755buf = 0;
622 } 619 }
623 } 620 }
621 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
627 { 625 {
628 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 627# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 643 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 645 unsigned int newlen = 1;
648 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
649 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
650 { 653 {
651#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 655 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
654 { 657 {
… …
773 } 776 }
774 777
775 if (newlen) 778 if (newlen)
776 len = strlen (kbuf); 779 len = strlen (kbuf);
777 780
781 if (len > 0)
782 {
778 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
779 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
780 */ 797 */
781#ifdef META8_OPTION 798#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
784#endif 801#endif
802 }
785 803
786 } 804 }
787 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
788 { 806 {
789 len = 1; 807 len = 1;
… …
823 { 841 {
824 view_start = 0; 842 view_start = 0;
825 want_refresh = 1; 843 want_refresh = 1;
826 } 844 }
827 845
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */ 846 /* escape prefix */
843 if (meta 847 if (meta
844#ifdef META8_OPTION 848#ifdef META8_OPTION
845 && meta_char == C0_ESC 849 && meta_char == C0_ESC
846#endif 850#endif
… …
851 } 855 }
852 856
853 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
854} 858}
855 859
856void 860void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
858{ 862{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 864 KeySym keysym;
861 865
… …
881 commit_iso14755 (); 885 commit_iso14755 ();
882 886
883 return; 887 return;
884 } 888 }
885 889
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 891 if (i[0] == keysym)
888 { 892 {
889 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 894 commit_iso14755 ();
891 895
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
930#endif 934#endif
931} 935}
932 936
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 937void
967rxvt_term::flush () 938rxvt_term::flush ()
968{ 939{
969 flush_ev.stop (); 940 flush_ev.stop ();
970 941
971#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
973 { 944 {
974// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 946 scr_touch (false);
976 } 947 }
977#endif 948#endif
978 949
979 if (want_refresh) 950 if (want_refresh)
… …
1016 while (row < end_row); 987 while (row < end_row);
1017 } 988 }
1018 989
1019 scr_refresh (); 990 scr_refresh ();
1020 scrollBar.show (1); 991 scrollBar.show (1);
1021#ifdef USE_XIM 992#if USE_XIM
1022 IMSendSpot (); 993 im_send_spot ();
1023#endif 994#endif
1024 } 995 }
1025 996
1026 display->flush (); 997 display->flush ();
1027} 998}
1028 999
1029/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1030void 1001void
1031rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1032{ 1003{
1033 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1015 refresh_count = 0;
1045 flush (); 1016 flush ();
1046} 1017}
1047 1018
1048#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1049void 1035void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1037{
1052 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1039 want_refresh = 1;
… …
1072 1058
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1060void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1062{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1065 {
1080 want_refresh = 1; 1066 want_refresh = 1;
1081 refresh_check (); 1067 refresh_check ();
1082 } 1068 }
1083 else 1069 else
… …
1128 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1118 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1119 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1120 // we just nanosleep a bit and hope for the best.
1135 1121
1136 struct timespec ts = { 0, 1000 }; 1122 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1138 1124
… …
1144 { 1130 {
1145 } 1131 }
1146} event_handler; 1132} event_handler;
1147#endif 1133#endif
1148 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1149bool 1168bool
1150rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1151{ 1170{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1153 1172
1154 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1174
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1157 n = 0;
1158 } 1176 {
1159 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1163 1182
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1184
1166 if (r > 0) 1185 if (r > 0)
1167 { 1186 {
1168 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1169 return true; 1188 return true;
… …
1200 pty_write (); 1219 pty_write ();
1201 1220
1202 refresh_check (); 1221 refresh_check ();
1203} 1222}
1204 1223
1205void 1224void ecb_cold
1206rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1207{ 1226{
1208 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor (); 1228 recolour_cursor ();
1210 1229
… …
1215 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1216#endif 1235#endif
1217} 1236}
1218 1237
1219#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1220void 1239void ecb_cold
1221rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1222{ 1241{
1223 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1224 return; 1243 return;
1225 1244
… …
1227 XFlush (dpy); 1246 XFlush (dpy);
1228 1247
1229 hidden_pointer = 1; 1248 hidden_pointer = 1;
1230} 1249}
1231 1250
1232void 1251void ecb_cold
1233rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1234{ 1253{
1235 make_current (); 1254 make_current ();
1236 1255
1237 pointer_blank (); 1256 pointer_blank ();
… …
1243{ 1262{
1244 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1245 int x, y; 1264 int x, y;
1246 int code = 32; 1265 int code = 32;
1247 1266
1248 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1250 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1251 { 1271 {
1252 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1253 return; 1273 return;
1274
1254 mouse_row = x; 1275 mouse_row = x;
1255 mouse_col = y; 1276 mouse_col = y;
1256 code += 32; 1277 code += 32;
1257 } 1278 }
1258 1279
… …
1261 else 1282 else
1262 { 1283 {
1263 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1286 if (button_number >= 3)
1266 button_number += (64 - 3); 1287 button_number += 64 - 3;
1267 } 1288 }
1268 1289
1269 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1270 { 1291 {
1271 /* 1292 /*
… …
1303 fputc ('A', stderr); 1324 fputc ('A', stderr);
1304 if (key_state & 32) 1325 if (key_state & 32)
1305 fputc ('2', stderr); 1326 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1328 button_number,
1308 x + 1, 1329 x,
1309 y + 1); 1330 y);
1310#endif 1331#endif
1311 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1312 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1347 code + button_number + key_state,
1314 (32 + x + 1), 1348 32 + x,
1315 (32 + y + 1)); 1349 32 + y);
1316} 1350}
1317 1351
1318/*{{{ process an X event */ 1352/*{{{ process an X event */
1319void 1353void ecb_hot
1320rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1321{ 1355{
1322 make_current (); 1356 make_current ();
1323 1357
1324 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1422 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1457 focus_out ();
1424 break; 1458 break;
1425 1459
1426 case ConfigureNotify: 1460 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1431 { 1462 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1434 1498
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1500 {
1437 seen_resize = 1; 1501 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1503 }
1440 else 1504 else
1441 { 1505 {
1442#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1507 if (moved)
1446 update_background (); 1508 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1509#endif
1451 } 1510 }
1452 1511
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1513 }
1455 break; 1514 break;
1456 1515
1457 case PropertyNotify: 1516 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1518 break;
1464 1519
1465 case SelectionClear: 1520 case SelectionClear:
1466 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1522 break;
1473 1523
1474 case SelectionRequest: 1524 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1476 break; 1526 break;
1477 1527
1478 case MapNotify: 1528 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1530 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1531 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1534 * reparenting.
1485 * We should not render background immidiately, as there could be several 1535 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1537 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1539 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1491 */ 1541 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1494#endif 1544#endif
1495 mapped = 1; 1545 mapped = 1;
1496#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1513 { 1563 {
1514 do 1564 do
1515 { 1565 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1568 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1570
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1572
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1574 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1577 }
1528 1578
1529 want_refresh = 1; 1579 want_refresh = 1;
1530 } 1580 }
1531 else 1581 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1588 ;
1539 1589
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1591 {
1542 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1593 scrollBar.show (0);
1544 } 1594 }
1545 } 1595 }
1546 break; 1596 break;
1547 1597
… …
1613 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1614 } 1664 }
1615 else 1665 else
1616 { 1666 {
1617 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1669 }
1620 1670
1621 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1673 + 1;
… …
1635#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1636 } 1686 }
1637#endif 1687#endif
1638 } 1688 }
1639 } 1689 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1691 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1644 ; 1694 ;
1645 1695
1646 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1700 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1702 scrollBar.size ());
1653 want_refresh = 1; 1703 want_refresh = 1;
1654 scrollBar.show (1); 1704 scrollBar.show (1);
1655 } 1705 }
1656 break; 1706 break;
1657 } 1707 }
1658 1708
1659#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1669 }
1670#endif 1712#endif
1671 1713
1672#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1716 {
… …
1684#endif 1726#endif
1685 1727
1686 refresh_check (); 1728 refresh_check ();
1687} 1729}
1688 1730
1689void 1731#if ENABLE_FRILLS
1732void ecb_cold
1690rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1691{ 1734{
1692 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1693 return; 1736 return;
1694 1737
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1739 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1700 } 1744 }
1701} 1745}
1746#endif
1702 1747
1703void 1748void ecb_cold
1704rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1705{ 1750{
1706 if (!focus) 1751 if (!focus)
1707 { 1752 {
1708 focus = 1; 1753 focus = 1;
1709 want_refresh = 1; 1754 want_refresh = 1;
1710 1755
1711#if USE_XIM 1756#if USE_XIM
1712 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1713 { 1758 {
1714 IMSetPosition (); 1759 im_set_position ();
1715 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1716 } 1761 }
1717#endif 1762#endif
1718#if CURSOR_BLINK 1763#if CURSOR_BLINK
1719 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1733 1778
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 } 1780 }
1736} 1781}
1737 1782
1738void 1783void ecb_cold
1739rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1740{ 1785{
1741 if (focus) 1786 if (focus)
1742 { 1787 {
1743 focus = 0; 1788 focus = 0;
… …
1776 1821
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 } 1823 }
1779} 1824}
1780 1825
1781void 1826void ecb_cold
1782rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1783{ 1828{
1784#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1786 { 1831 {
… …
1790 } 1835 }
1791#endif 1836#endif
1792} 1837}
1793 1838
1794#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1795void 1840void ecb_hot
1796rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1797{ 1842{
1798 make_current (); 1843 make_current ();
1799 1844
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1810 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1811 */ 1856 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1859 {
1815 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1816 update_background (); 1861 update_background ();
1817 } 1862 }
1818 1863
1819 break; 1864 break;
1820 } 1865 }
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1863 { 1908 {
1864 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1865 MEvent.clicks++; 1910 MEvent.clicks++;
1866 1911
1867 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1868 { 1913 {
1869 /* only report double clicks */ 1914 /* only report double clicks */
… …
1950 if (scrollBar.upButton (ev.y)) 1995 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */ 1996 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y)) 1997 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */ 1998 direction = DN; /* down */
1954 1999
1955 scrollBar.state = STATE_IDLE; 2000 scrollBar.state = SB_STATE_IDLE;
1956 /* 2001 /*
1957 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1958 * move up if mouse is above slider 2003 * move up if mouse is above slider
1959 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1960 * 2005 *
… …
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2045#endif
2001 if (scr_page (direction, 1)) 2046 if (scr_page (direction, 1))
2002 { 2047 {
2003 if (direction == UP) 2048 if (direction == UP)
2004 scrollBar.state = STATE_UP; 2049 scrollBar.state = SB_STATE_UP;
2005 else 2050 else
2006 scrollBar.state = STATE_DOWN; 2051 scrollBar.state = SB_STATE_DOWN;
2007 } 2052 }
2008 } 2053 }
2009 else 2054 else
2010 switch (ev.button) 2055 switch (ev.button)
2011 { 2056 {
2012 case Button2: 2057 case Button2:
2013 switch (scrollBar.align) 2058 switch (scrollBar.align)
2014 { 2059 {
2015 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2016 csrO = 0; 2061 csrO = 0;
2017 break; 2062 break;
2018 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2065 break;
2021 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2068 break;
2024 } 2069 }
2025 2070
2026 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2075
2031 scrollBar.state = STATE_MOTION; 2076 scrollBar.state = SB_STATE_MOTION;
2032 break; 2077 break;
2033 2078
2034 case Button1: 2079 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2038 2083
2039 case Button3: 2084 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2086 {
2042 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2045# else 2090# else
2046 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2047# endif 2092# endif
2048 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2051# else 2096# else
2052 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2053# endif 2098# endif
2054 else 2099 else
2055 scrollBar.state = STATE_MOTION; 2100 scrollBar.state = SB_STATE_MOTION;
2056 } 2101 }
2057 else 2102 else
2058 { 2103 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2105 (nrow
2061 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2062 / scrollBar.size ())); 2107 / scrollBar.size ()));
2063 } 2108 }
2064 2109
2065 break; 2110 break;
2066 } 2111 }
… …
2077 2122
2078 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2124 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2126
2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2128 {
2084 scrollBar.state = STATE_IDLE; 2129 scrollBar.state = SB_STATE_IDLE;
2085 scrollBar.show (0); 2130 scrollBar.show (0);
2086 } 2131 }
2087 2132
2088#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
… …
2139 case Button3: 2184 case Button3:
2140 selection_make (ev.time); 2185 selection_make (ev.time);
2141 break; 2186 break;
2142 2187
2143 case Button2: 2188 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2189 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2191 break;
2147 2192
2148#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2149 case Button4: 2194 case Button4:
2150 case Button5: 2195 case Button5:
… …
2184 } 2229 }
2185} 2230}
2186 2231
2187/*}}} */ 2232/*}}} */
2188 2233
2189void 2234void ecb_hot
2190rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2191{ 2236{
2192 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2194 2239
2195 for (;;) 2240 for (;;)
2196 { 2241 {
2197 if (expect_false (ch == NOCHAR)) 2242 if (ecb_unlikely (ch == NOCHAR))
2198 { 2243 {
2199 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2245 ch = next_char ();
2201 2246
2202 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2203 break; 2248 break;
2204 } 2249 }
2205 2250
2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2251 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2252 {
2208 if (expect_false (!seen_input)) 2253 if (ecb_unlikely (!seen_input))
2209 { 2254 {
2210 seen_input = 1; 2255 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2271 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2273
2229 for (;;) 2274 for (;;)
2230 { 2275 {
2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2276 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2277 break;
2233 2278
2234 *str++ = ch; 2279 *str++ = ch;
2235 2280
2236 if (expect_false (ch == C0_LF || str >= eol)) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2282 {
2238 if (ch == C0_LF) 2283 if (ch == C0_LF)
2239 nlines++; 2284 nlines++;
2240 2285
2241 refresh_count++; 2286 refresh_count++;
… …
2313 } 2358 }
2314 } 2359 }
2315} 2360}
2316 2361
2317// read the next character 2362// read the next character
2318wchar_t 2363wchar_t ecb_hot
2319rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2320{ 2365{
2321 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2322 { 2367 {
2323 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2325 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2326 2371
2327 wchar_t wc; 2372 wchar_t wc;
2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2329 2374
… …
2334 break; 2379 break;
2335 } 2380 }
2336 2381
2337 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2338 { 2383 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2384 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2386 }
2342 2387
2343 // assume wchar == unicode 2388 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
… …
2347 2392
2348 return NOCHAR; 2393 return NOCHAR;
2349} 2394}
2350 2395
2351// read the next octet 2396// read the next octet
2352uint32_t 2397uint32_t ecb_hot
2353rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2354{ 2399{
2355 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2356 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2357 : NOCHAR; 2402 : NOCHAR;
2358} 2403}
2359 2404
2360static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2361 2406
2362/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2363/*
2364 * Return the next input character after first passing any keyboard input
2365 * to the command.
2366 */
2367wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2409{
2370 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2371 2411
2372 if (c == NOCHAR) 2412 if (c == NOCHAR)
2373 throw out_of_input; 2413 throw out_of_input;
2374 2414
2375 return c; 2415 return c;
2376} 2416}
2377 2417
2378uint32_t 2418uint32_t ecb_hot
2379rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2380{ 2420{
2381 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2382 2422
2383 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2387} 2427}
2388 2428
2389/*{{{ print pipe */ 2429/*{{{ print pipe */
2390/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2391#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2392FILE * 2432FILE * ecb_cold
2393rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2394{ 2434{
2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2396 2436
2397 if (stream == NULL) 2437 if (stream == NULL)
2398 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2399 2439
2400 return stream; 2440 return stream;
2401} 2441}
2402 2442
2403int 2443int ecb_cold
2404rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2405{ 2445{
2406 fflush (stream); 2446 fflush (stream);
2407 return pclose (stream); 2447 return pclose (stream);
2408} 2448}
2409 2449
2410/* 2450/*
2411 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2412 */ 2452 */
2413void 2453void ecb_cold
2414rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2415{ 2455{
2416 FILE *fd = popen_printer (); 2456 FILE *fd = popen_printer ();
2417 2457
2418 if (!fd) 2458 if (!fd)
… …
2464 pclose_printer (fd); 2504 pclose_printer (fd);
2465} 2505}
2466#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2467/*}}} */ 2507/*}}} */
2468 2508
2469/* *INDENT-OFF* */
2470enum { 2509enum {
2471 C1_40 = 0x40, 2510 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2511 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2512 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2513 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2514 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2515};
2477/* *INDENT-ON* */
2478 2516
2479/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2480void 2518void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2520{
2483 switch (ch) 2521 switch (ch)
2484 { 2522 {
2485 case C0_ESC: 2523 case C0_ESC:
… …
2531} 2569}
2532/*}}} */ 2570/*}}} */
2533 2571
2534 2572
2535/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2536void 2574void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2576{
2539 int row, col; 2577 int row, col;
2540 2578
2541 switch (ch) 2579 switch (ch)
… …
2575 break; 2613 break;
2576 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2616 break;
2579 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2580 set_privmode (PrivMode_vt52, 0); 2618 priv_modes &= ~PrivMode_vt52;
2581 break; 2619 break;
2582 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2584 /* unimplemented */ 2622 /* unimplemented */
2585 break; 2623 break;
… …
2591} 2629}
2592/*}}} */ 2630/*}}} */
2593 2631
2594 2632
2595/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2596void 2634void ecb_hot
2597rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2598{ 2636{
2599 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2600 2638
2601 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2642 return;
2605 } 2643 }
2606 2644
2607 switch (ch) 2645 switch (ch)
2608 { 2646 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2647 case '#':
2611 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2612 scr_E (); 2649 scr_E ();
2613 break; 2650 break;
2614 case '(': 2651 case '(':
… …
2637#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2638 case '9': 2675 case '9':
2639 scr_forwardindex (); 2676 scr_forwardindex ();
2640 break; 2677 break;
2641#endif 2678#endif
2679 // DECPAM/DECPNM
2642 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2643 case '>': 2683 case '>':
2644 set_privmode (PrivMode_aplKP, ch == '='); 2684 priv_modes &= ~PrivMode_aplKP;
2645 break; 2685 break;
2646 2686
2647 case C1_40: 2687 case C1_40:
2648 cmd_getc (); 2688 cmd_getc ();
2649 break; 2689 break;
… …
2653 2693
2654 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2656 { 2696 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2699 }
2660 break; 2700 break;
2661 2701
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2664 process_graphics (); 2704 // used by original rxvt for rob nations own graphics mode
2705 if (cmd_getc () == 'Q')
2706 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2707 break;
2666 2708
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2674 scr_index (DN); 2716 scr_index (DN);
2675 break; 2717 break;
2676 2718
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2679 2721
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2682 2724
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2727 process_dcs_seq ();
2686 break; 2728 break;
… …
2719 } 2761 }
2720} 2762}
2721/*}}} */ 2763/*}}} */
2722 2764
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2766enum {
2726 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2776};
2736 2777
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2783
2743const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2744 { 2785 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2794 };
2754/* *INDENT-ON* */
2755 2795
2756void 2796void ecb_hot
2757rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2758{ 2798{
2759 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2760 unsigned int nargs, p; 2800 unsigned int nargs, p;
2761 int n, ndef; 2801 int n, ndef;
… …
2837 { 2877 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2878 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2879 scr_soft_reset ();
2840 2880
2841 static const int pm_h[] = { 7, 25 }; 2881 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2882 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2883
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2884 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2885 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2846 } 2886 }
2847 break; 2887 break;
2848 } 2888 }
2849 2889
2850 return; 2890 return;
… …
2868 } 2908 }
2869 break; 2909 break;
2870#endif 2910#endif
2871 2911
2872 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2873 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2874 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2875 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2876 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2877 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2878 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2879 break; 2919 break;
2880 2920
2881 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2882 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3069 } 3109 }
3070} 3110}
3071/*}}} */ 3111/*}}} */
3072 3112
3073#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3074/* ARGSUSED */
3075void 3114void
3076rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3077{ 3116{
3078 int x, y; 3117 int x, y;
3079 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3088 { 3127 {
3089 /* 3128 /*
3090 * commands 3129 * commands
3091 */ 3130 */
3092 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3093 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3094 break; 3133 break;
3095 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3096 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3097 break; 3136 break;
3098 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3099 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3100 break; 3139 break;
3101 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103 break; 3142 break;
3104 case 5: /* raise window */ 3143 case 5: /* raise window */
3105 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3106 break; 3145 break;
3107 case 6: /* lower window */ 3146 case 6: /* lower window */
3108 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3109 break; 3148 break;
3110 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3111 scr_touch (true); 3150 scr_touch (true);
3112 break; 3151 break;
3113 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3116 break; 3155 break;
3117 3156
3118 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3119 default: 3158 default:
3120 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3121 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3122 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3123 break; 3162 break;
3124 3163
3125 /* 3164 /*
3126 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3127 */ 3166 */
3128 case 11: /* report window state */ 3167 case 11: /* report window state */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131 break; 3170 break;
3132 case 13: /* report window position */ 3171 case 13: /* report window position */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3134 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3135 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3136 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3137 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3138 break; 3177 break;
3139 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142 break; 3181 break;
3143 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3144 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145 break; 3184 break;
… …
3147 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148 break; 3187 break;
3149 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3150 { 3189 {
3151 char *s; 3190 char *s;
3152 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s); 3193 XFree (s);
3155 } 3194 }
3156 break; 3195 break;
3157 case 21: /* report window title */ 3196 case 21: /* report window title */
3158 { 3197 {
3159 char *s; 3198 char *s;
3160 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3201 XFree (s);
3163 } 3202 }
3164 break; 3203 break;
3165 } 3204 }
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3261 */
3223void 3262void
3224rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3225{ 3264{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3265 /*
3230 * Not handled yet 3266 * Not handled yet
3231 */ 3267 */
3268
3269 unicode_t eh;
3232 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3233 if (s) 3271 if (s)
3234 free (s); 3272 free (s);
3235 3273
3236 return; 3274 return;
3237} 3275}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3280 */
3243void 3281void
3244rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3245{ 3283{
3246 unicode_t ch, eh;
3247 int arg; 3284 int arg;
3248 3285
3249 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3252 3289
3253 if (ch == ';') 3290 if (ch == ';')
3254 { 3291 {
3292 unicode_t eh;
3255 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3256 3294
3257 if (s) 3295 if (s)
3258 { 3296 {
3259 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3283 3321
3284/* 3322/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3324 */
3287void 3325void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3327{
3290 int color; 3328 int color;
3291 char *buf, *name; 3329 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3331 int saveop = op;
… …
3320 unsigned long bytes_after; 3358 unsigned long bytes_after;
3321 unsigned char *value = 0; 3359 unsigned char *value = 0;
3322 const char *str = ""; 3360 const char *str = "";
3323 3361
3324 if (prop 3362 if (prop
3325 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3326 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3327 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3328 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3329 && actual_type != None 3367 && actual_type != None
3330 && actual_format == 8) 3368 && actual_format == 8)
… …
3334 3372
3335 XFree (value); 3373 XFree (value);
3336 } 3374 }
3337 else 3375 else
3338 { 3376 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3340 3378
3341 if (eq) 3379 if (eq)
3342 { 3380 {
3343 *eq = 0; 3381 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3345 } 3383 }
3346 else 3384 else
3347 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3348 display->atom (str)); 3386 display->atom (str));
3349 } 3387 }
3350 break; 3388 break;
3351 3389
3352 case XTerm_Color: 3390 case XTerm_Color:
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3423 break;
3386 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3426 break;
3427#ifdef OPTION_HC
3428 case XTerm_Color_HC:
3429 process_color_seq (op, Color_HC, str, resp);
3430 break;
3431 case XTerm_Color_HTC:
3432 process_color_seq (op, Color_HTC, str, resp);
3433 break;
3434#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3396 break; 3438 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3400 break; 3441 break;
3401 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
… …
3410 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3411 { 3452 {
3412 bool changed = false; 3453 bool changed = false;
3413 3454
3414 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3416 else
3417 changed = bgPixmap.unset_tint ();
3418 3457
3419 if (changed) 3458 if (changed)
3420 update_background (); 3459 update_background ();
3421 } 3460 }
3422 3461
… …
3426#if BG_IMAGE_FROM_FILE 3465#if BG_IMAGE_FROM_FILE
3427 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3429 { 3468 {
3430 char str[256]; 3469 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale;
3475 v_scale = image_vec[0].v_scale;
3476 h_align = image_vec[0].h_align;
3477 v_align = image_vec[0].v_align;
3478 }
3431 3479
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3484 }
3437 else 3485 else
3438 { 3486 {
3439 int changed = 0; 3487 bool changed = false;
3440 3488
3441 if (*str != ';') 3489 if (*str != ';')
3442 { 3490 {
3443 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3444 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 else
3494 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str))
3497 image_vec.pop_back ();
3498 else
3446 changed++; 3499 changed = true;
3447 str = strchr (str, ';'); 3500 }
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 } 3501 }
3451 3502 else
3452 while (str)
3453 { 3503 {
3454 str++; 3504 str++;
3455 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3456 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3457 str = strchr (str, ';');
3458 } 3507 }
3459 3508
3460 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 bg_set_position (x, y);
3516 }
3461 update_background (); 3517 update_background ();
3518 }
3462 } 3519 }
3463 break; 3520 break;
3464#endif 3521#endif
3465 3522
3466 case XTerm_logfile: 3523 case XTerm_logfile:
… …
3553 * 's' = save 3610 * 's' = save
3554 * 'r' = restore 3611 * 'r' = restore
3555 * 't' = toggle 3612 * 't' = toggle
3556 * so no need for fancy checking 3613 * so no need for fancy checking
3557 */ 3614 */
3558int 3615int ecb_cold
3559rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3560{ 3617{
3561 int state; 3618 int state;
3562 3619
3563 if (mode == 's') 3620 if (mode == 's')
3564 { 3621 {
3565 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3566 return -1; 3626 return -1;
3567 } 3627 }
3568 else 3628 else
3569 { 3629 {
3570 if (mode == 'r') 3630 if (mode == 'r')
3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3572 else 3632 else
3573 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3574 set_privmode (bit, state); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3575 } 3639 }
3576 3640
3577 return state; 3641 return state;
3578} 3642}
3579 3643
3580/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3581void 3645void
3582rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3646rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3583{ 3647{
3584 unsigned int i, j; 3648 unsigned int i, j;
3585 int state; 3649 int state;
3586 3650
3587 static const struct 3651 static const struct
3588 { 3652 {
3589 const int argval; 3653 const int argval;
3590 const unsigned long bit; 3654 const unsigned long bit;
3591 } argtopriv[] = { 3655 } argtopriv[] = {
3592 { 1, PrivMode_aplCUR }, // DECCKM 3656 { 1, PrivMode_aplCUR }, // DECCKM
3593 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3594 { 3, PrivMode_132 }, // DECCOLM 3658 { 3, PrivMode_132 }, // DECCOLM
3595 { 4, PrivMode_smoothScroll }, // DECSCLM 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3596 { 5, PrivMode_rVideo }, // DECSCNM 3660 { 5, PrivMode_rVideo }, // DECSCNM
3597 { 6, PrivMode_relOrigin }, // DECOM 3661 { 6, PrivMode_relOrigin }, // DECOM
3598 { 7, PrivMode_Autowrap }, // DECAWM 3662 { 7, PrivMode_Autowrap }, // DECAWM
3599 // 8, auto-repeat keys // DECARM 3663 // 8, auto-repeat keys // DECARM
3600 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3601 // 18 end FF to printer after print screen 3665 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region 3666 // 19 Print screen prints full screen/scroll region
3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3604#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3605 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3606#endif 3670#endif
3607 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK 3672 // 38, tektronix mode // DECTEK
3609 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3610 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3611 // 45 margin bell NYI 3675 // 45 margin bell NYI
3612 // 46 start logging 3676 // 46 start logging
3613 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3678 { 66, PrivMode_aplKP }, // DECNKM
3615#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3616 { 67, PrivMode_BackSpace }, // DECBKM 3680 { 67, PrivMode_BackSpace }, // DECBKM
3617#endif 3681#endif
3618 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3619 { 1002, PrivMode_MouseBtnEvent }, 3683 { 1002, PrivMode_MouseBtnEvent },
3620 { 1003, PrivMode_MouseAnyEvent }, 3684 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3622 { 1011, PrivMode_Keypress }, // rxvt extension 3689 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS
3691 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3692#endif
3623 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3624 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3625 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3626 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3627 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3698 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste }, 3700 { 2004, PrivMode_BracketPaste },
3631 }; 3701 };
3632 3702
… …
3642 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3643 { 3713 {
3644 state = -1; 3714 state = -1;
3645 3715
3646 /* basic handling */ 3716 /* basic handling */
3647 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3648 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3649 { 3719 {
3650 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3651 break; 3721 break;
3652 } 3722 }
… …
3660 3730
3661 scr_touch (true); 3731 scr_touch (true);
3662 break; 3732 break;
3663#endif 3733#endif
3664 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3665 case 1049:
3666 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3736 if (mode == 0)
3668 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3669 else if (mode == 1) 3738 else if (mode == 1)
3670 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3679 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode 3751 * within VT52 mode
3683 */ 3752 */
3684 set_privmode (PrivMode_vt52, 1); 3753 priv_modes |= PrivMode_vt52;
3685 break; 3754 break;
3686 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3687 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3688 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3689 break; 3758 break;
… …
3704 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3705 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3706 break; 3775 break;
3707#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3708 case scrollBar_esc: 3777 case scrollBar_esc:
3709 if (scrollBar.map (state)) 3778 scrollBar.map (state);
3710 {
3711 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3712 scr_touch (true); 3780 scr_touch (true);
3713 }
3714 break; 3781 break;
3715#endif 3782#endif
3716 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3717 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3718 break; 3785 break;
… …
3731 case 1003: 3798 case 1003:
3732 if (state) 3799 if (state)
3733 { 3800 {
3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3735 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3802 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3803 mouse_row = mouse_col = 0;
3736 vt_emask_mouse = PointerMotionMask; 3804 vt_emask_mouse = PointerMotionMask;
3737 } 3805 }
3738 else 3806 else
3739 vt_emask_mouse = NoEventMask; 3807 vt_emask_mouse = NoEventMask;
3740 3808
… …
3746 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3747 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3748 break; 3816 break;
3749 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3750 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3751 if (current_screen != PRIMARY) 3819 if (!state)
3752 scr_erase_screen (2); 3820 scr_erase_screen (2);
3753 3821
3754 scr_change_screen (state); 3822 scr_change_screen (state);
3755 break; 3823 break;
3756 case 1049: /* secondary screen w/ clearing first */ 3824 case 1049: /* secondary screen w/ clearing first */
3825 if (option (Opt_secondaryScreen))
3826 if (state)
3827 scr_cursor (SAVE);
3828
3757 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3758 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 3832 if (state)
3760 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3761 break; 3836 break;
3762 default: 3837 default:
3763 break; 3838 break;
3764 } 3839 }
3765 } 3840 }
3766} 3841}
3767/*}}} */ 3842/*}}} */
3768 3843
3769/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3770void 3845void ecb_hot
3771rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3772{ 3847{
3773 unsigned int i; 3848 unsigned int i;
3774 short rendset; 3849 short rendset;
3775 int rendstyle; 3850 int rendstyle;
… …
3918 } 3993 }
3919 } 3994 }
3920} 3995}
3921/*}}} */ 3996/*}}} */
3922 3997
3923/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3924void
3925rxvt_term::process_graphics ()
3926{
3927 unicode_t ch, cmd = cmd_getc ();
3928
3929 if (cmd == 'Q')
3930 {
3931 /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return;
3934 }
3935 /* swallow other graphics sequences until terminating ':' */
3936 do
3937 ch = cmd_getc ();
3938 while (ch != ':');
3939}
3940/*}}} */
3941
3942/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3943 3999
3944/* 4000/*
3945 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3946 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3959 4015
3960/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3961/* Write data to the pty as typed by the user, pasted with the mouse, 4017/* Write data to the pty as typed by the user, pasted with the mouse,
3962 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3963 */ 4019 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965 4021
3966void 4022void
3967rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4024{
3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3974 4030
3975 if (v_buflen == 0) 4031 if (v_buflen == 0)
3976 { 4032 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4033 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978 4034
4035 max_it (written, 0);
4036
3979 if ((unsigned int)written == len) 4037 if (written == len)
3980 return; 4038 return;
3981 4039
3982 data += written; 4040 data += written;
3983 len -= written; 4041 len -= written;
3984 } 4042 }
3985 4043
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4045
3988 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4047 v_buflen += len;
3990 4048
3991 pty_ev.set (ev::READ | ev::WRITE); 4049 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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