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.430 by root, Wed Nov 12 02:37:58 2008 UTC vs.
Revision 1.513 by sf-exg, Thu May 31 05:53:46 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;
… …
415 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
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
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 423
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#ifdef USE_XIM
430 if (Input_Context) 427 if (Input_Context)
… …
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)
… …
1017 } 988 }
1018 989
1019 scr_refresh (); 990 scr_refresh ();
1020 scrollBar.show (1); 991 scrollBar.show (1);
1021#ifdef USE_XIM 992#ifdef 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#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1434 1484
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1486 {
1437 seen_resize = 1; 1487 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1489 }
1440 else 1490 else
1441 { 1491 {
1442#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1493 if (moved)
1446 update_background (); 1494 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1495#endif
1451 } 1496 }
1452 1497
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1499 }
1455 break; 1500 break;
1456 1501
1457 case PropertyNotify: 1502 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 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; 1504 break;
1464 1505
1465 case SelectionClear: 1506 case SelectionClear:
1466 selection_clear (); 1507 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; 1508 break;
1473 1509
1474 case SelectionRequest: 1510 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1476 break; 1512 break;
1477 1513
1478 case MapNotify: 1514 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1516 /* 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 1517 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1520 * reparenting.
1485 * We should not render background immidiately, as there could be several 1521 * 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 1522 * 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 1523 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1491 */ 1527 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1494#endif 1530#endif
1495 mapped = 1; 1531 mapped = 1;
1496#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1513 { 1549 {
1514 do 1550 do
1515 { 1551 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1554 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1556
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1558
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1560 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1563 }
1528 1564
1529 want_refresh = 1; 1565 want_refresh = 1;
1530 } 1566 }
1531 else 1567 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1574 ;
1539 1575
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1577 {
1542 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1579 scrollBar.show (0);
1544 } 1580 }
1545 } 1581 }
1546 break; 1582 break;
1547 1583
… …
1613 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1614 } 1650 }
1615 else 1651 else
1616 { 1652 {
1617 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1655 }
1620 1656
1621 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1659 + 1;
… …
1635#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1636 } 1672 }
1637#endif 1673#endif
1638 } 1674 }
1639 } 1675 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1677 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1644 ; 1680 ;
1645 1681
1646 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1686 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1688 scrollBar.size ());
1653 want_refresh = 1; 1689 want_refresh = 1;
1654 scrollBar.show (1); 1690 scrollBar.show (1);
1655 } 1691 }
1656 break; 1692 break;
1657 } 1693 }
1658 1694
1659#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 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 (); 1697 cursor_blink_reset ();
1669 }
1670#endif 1698#endif
1671 1699
1672#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1702 {
… …
1685 1713
1686 refresh_check (); 1714 refresh_check ();
1687} 1715}
1688 1716
1689#if ENABLE_FRILLS 1717#if ENABLE_FRILLS
1690void 1718void ecb_cold
1691rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1692{ 1720{
1693 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1694 return; 1722 return;
1695 1723
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1725 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1701 } 1730 }
1702} 1731}
1703#endif 1732#endif
1704 1733
1705void 1734void ecb_cold
1706rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1707{ 1736{
1708 if (!focus) 1737 if (!focus)
1709 { 1738 {
1710 focus = 1; 1739 focus = 1;
1711 want_refresh = 1; 1740 want_refresh = 1;
1712 1741
1713#if USE_XIM 1742#if USE_XIM
1714 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1715 { 1744 {
1716 IMSetPosition (); 1745 im_set_position ();
1717 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1718 } 1747 }
1719#endif 1748#endif
1720#if CURSOR_BLINK 1749#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1735 1764
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1737 } 1766 }
1738} 1767}
1739 1768
1740void 1769void ecb_cold
1741rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1742{ 1771{
1743 if (focus) 1772 if (focus)
1744 { 1773 {
1745 focus = 0; 1774 focus = 0;
… …
1778 1807
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780 } 1809 }
1781} 1810}
1782 1811
1783void 1812void ecb_cold
1784rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1785{ 1814{
1786#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1787 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1788 { 1817 {
… …
1792 } 1821 }
1793#endif 1822#endif
1794} 1823}
1795 1824
1796#if ENABLE_TRANSPARENCY || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1797void 1826void ecb_hot
1798rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1799{ 1828{
1800 make_current (); 1829 make_current ();
1801 1830
1802 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1812 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1813 */ 1842 */
1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816 { 1845 {
1817 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1818 update_background (); 1847 update_background ();
1819 } 1848 }
1820 1849
1821 break; 1850 break;
1822 } 1851 }
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1865 { 1894 {
1866 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1867 MEvent.clicks++; 1896 MEvent.clicks++;
1868 1897
1869 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1870 { 1899 {
1871 /* only report double clicks */ 1900 /* only report double clicks */
… …
1952 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */ 1982 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */ 1984 direction = DN; /* down */
1956 1985
1957 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1958 /* 1987 /*
1959 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 1989 * move up if mouse is above slider
1961 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1962 * 1991 *
… …
2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2002#endif 2031#endif
2003 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2004 { 2033 {
2005 if (direction == UP) 2034 if (direction == UP)
2006 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2007 else 2036 else
2008 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2009 } 2038 }
2010 } 2039 }
2011 else 2040 else
2012 switch (ev.button) 2041 switch (ev.button)
2013 { 2042 {
2014 case Button2: 2043 case Button2:
2015 switch (scrollBar.align) 2044 switch (scrollBar.align)
2016 { 2045 {
2017 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2018 csrO = 0; 2047 csrO = 0;
2019 break; 2048 break;
2020 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2021 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2022 break; 2051 break;
2023 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2024 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2025 break; 2054 break;
2026 } 2055 }
2027 2056
2028 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2029 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2030 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2032 2061
2033 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2034 break; 2063 break;
2035 2064
2036 case Button1: 2065 case Button1:
2037 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2038 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2039 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2040 2069
2041 case Button3: 2070 case Button3:
2042 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2043 { 2072 {
2044 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2045# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2046 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2047# else 2076# else
2048 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2049# endif 2078# endif
2050 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2052 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2053# else 2082# else
2054 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2055# endif 2084# endif
2056 else 2085 else
2057 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2058 } 2087 }
2059 else 2088 else
2060 { 2089 {
2061 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2062 (nrow 2091 (nrow
2063 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2064 / scrollBar.size ())); 2093 / scrollBar.size ()));
2065 } 2094 }
2066 2095
2067 break; 2096 break;
2068 } 2097 }
… …
2079 2108
2080 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2081 if (!bypass_keystate) 2110 if (!bypass_keystate)
2082 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2083 2112
2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2085 { 2114 {
2086 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2087 scrollBar.show (0); 2116 scrollBar.show (0);
2088 } 2117 }
2089 2118
2090#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2091 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2141 case Button3: 2170 case Button3:
2142 selection_make (ev.time); 2171 selection_make (ev.time);
2143 break; 2172 break;
2144 2173
2145 case Button2: 2174 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2177 break;
2149 2178
2150#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2151 case Button4: 2180 case Button4:
2152 case Button5: 2181 case Button5:
… …
2186 } 2215 }
2187} 2216}
2188 2217
2189/*}}} */ 2218/*}}} */
2190 2219
2191void 2220void ecb_hot
2192rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2193{ 2222{
2194 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2196 2225
2197 for (;;) 2226 for (;;)
2198 { 2227 {
2199 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2200 { 2229 {
2201 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2231 ch = next_char ();
2203 2232
2204 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2205 break; 2234 break;
2206 } 2235 }
2207 2236
2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2238 {
2210 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2211 { 2240 {
2212 seen_input = 1; 2241 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2257 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2259
2231 for (;;) 2260 for (;;)
2232 { 2261 {
2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2263 break;
2235 2264
2236 *str++ = ch; 2265 *str++ = ch;
2237 2266
2238 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2268 {
2240 if (ch == C0_LF) 2269 if (ch == C0_LF)
2241 nlines++; 2270 nlines++;
2242 2271
2243 refresh_count++; 2272 refresh_count++;
… …
2315 } 2344 }
2316 } 2345 }
2317} 2346}
2318 2347
2319// read the next character 2348// read the next character
2320wchar_t 2349wchar_t ecb_hot
2321rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2322{ 2351{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2353 {
2325 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2328 2357
2329 wchar_t wc; 2358 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2360
… …
2336 break; 2365 break;
2337 } 2366 }
2338 2367
2339 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2340 { 2369 {
2341 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2370 mbstate.reset (); // reset now undefined conversion state
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2343 } 2372 }
2344 2373
2345 // assume wchar == unicode 2374 // assume wchar == unicode
2346 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
… …
2349 2378
2350 return NOCHAR; 2379 return NOCHAR;
2351} 2380}
2352 2381
2353// read the next octet 2382// read the next octet
2354uint32_t 2383uint32_t ecb_hot
2355rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2356{ 2385{
2357 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2358 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2359 : NOCHAR; 2388 : NOCHAR;
2360} 2389}
2361 2390
2362static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2363 2392
2364/* rxvt_cmd_getc () - Return next input character */ 2393wchar_t ecb_hot
2365/*
2366 * Return the next input character after first passing any keyboard input
2367 * to the command.
2368 */
2369wchar_t
2370rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2371{ 2395{
2372 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2373 2397
2374 if (c == NOCHAR) 2398 if (c == NOCHAR)
2375 throw out_of_input; 2399 throw out_of_input;
2376 2400
2377 return c; 2401 return c;
2378} 2402}
2379 2403
2380uint32_t 2404uint32_t ecb_hot
2381rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2382{ 2406{
2383 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2384 2408
2385 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2389} 2413}
2390 2414
2391/*{{{ print pipe */ 2415/*{{{ print pipe */
2392/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2393#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2394FILE * 2418FILE * ecb_cold
2395rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2396{ 2420{
2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2398 2422
2399 if (stream == NULL) 2423 if (stream == NULL)
2400 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2401 2425
2402 return stream; 2426 return stream;
2403} 2427}
2404 2428
2405int 2429int ecb_cold
2406rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2407{ 2431{
2408 fflush (stream); 2432 fflush (stream);
2409 return pclose (stream); 2433 return pclose (stream);
2410} 2434}
2411 2435
2412/* 2436/*
2413 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2414 */ 2438 */
2415void 2439void ecb_cold
2416rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2417{ 2441{
2418 FILE *fd = popen_printer (); 2442 FILE *fd = popen_printer ();
2419 2443
2420 if (!fd) 2444 if (!fd)
… …
2466 pclose_printer (fd); 2490 pclose_printer (fd);
2467} 2491}
2468#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2469/*}}} */ 2493/*}}} */
2470 2494
2471/* *INDENT-OFF* */
2472enum { 2495enum {
2473 C1_40 = 0x40, 2496 C1_40 = 0x40,
2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2475 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2476 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478}; 2501};
2479/* *INDENT-ON* */
2480 2502
2481/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2482void 2504void ecb_hot
2483rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2506{
2485 switch (ch) 2507 switch (ch)
2486 { 2508 {
2487 case C0_ESC: 2509 case C0_ESC:
… …
2533} 2555}
2534/*}}} */ 2556/*}}} */
2535 2557
2536 2558
2537/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2538void 2560void ecb_cold
2539rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2540{ 2562{
2541 int row, col; 2563 int row, col;
2542 2564
2543 switch (ch) 2565 switch (ch)
… …
2577 break; 2599 break;
2578 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2602 break;
2581 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2582 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2583 break; 2605 break;
2584 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2586 /* unimplemented */ 2608 /* unimplemented */
2587 break; 2609 break;
… …
2593} 2615}
2594/*}}} */ 2616/*}}} */
2595 2617
2596 2618
2597/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2598void 2620void ecb_hot
2599rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2600{ 2622{
2601 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2602 2624
2603 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2606 return; 2628 return;
2607 } 2629 }
2608 2630
2609 switch (ch) 2631 switch (ch)
2610 { 2632 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2633 case '#':
2613 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2614 scr_E (); 2635 scr_E ();
2615 break; 2636 break;
2616 case '(': 2637 case '(':
… …
2639#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2640 case '9': 2661 case '9':
2641 scr_forwardindex (); 2662 scr_forwardindex ();
2642 break; 2663 break;
2643#endif 2664#endif
2665 // DECPAM/DECPNM
2644 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2645 case '>': 2669 case '>':
2646 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2647 break; 2671 break;
2648 2672
2649 case C1_40: 2673 case C1_40:
2650 cmd_getc (); 2674 cmd_getc ();
2651 break; 2675 break;
… …
2655 2679
2656 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2658 { 2682 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2685 }
2662 break; 2686 break;
2663 2687
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2666 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2693 break;
2668 2694
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2675 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2676 scr_index (DN); 2702 scr_index (DN);
2677 break; 2703 break;
2678 2704
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2681 2707
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2684 2710
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2713 process_dcs_seq ();
2688 break; 2714 break;
… …
2721 } 2747 }
2722} 2748}
2723/*}}} */ 2749/*}}} */
2724 2750
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2752enum {
2728 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2729 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2730 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2731 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2762};
2738 2763
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2769
2745const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2746 { 2771 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2752 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2753 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2754 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2755 }; 2780 };
2756/* *INDENT-ON* */
2757 2781
2758void 2782void ecb_hot
2759rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2760{ 2784{
2761 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2762 unsigned int nargs, p; 2786 unsigned int nargs, p;
2763 int n, ndef; 2787 int n, ndef;
… …
2839 { 2863 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset (); 2865 scr_soft_reset ();
2842 2866
2843 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845 2869
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2848 } 2872 }
2849 break; 2873 break;
2850 } 2874 }
2851 2875
2852 return; 2876 return;
… …
2870 } 2894 }
2871 break; 2895 break;
2872#endif 2896#endif
2873 2897
2874 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2875 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2876 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2878 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2879 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2880 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2881 break; 2905 break;
2882 2906
2883 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2884 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3071 } 3095 }
3072} 3096}
3073/*}}} */ 3097/*}}} */
3074 3098
3075#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3076/* ARGSUSED */
3077void 3100void
3078rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3079{ 3102{
3080 int x, y; 3103 int x, y;
3081 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3090 { 3113 {
3091 /* 3114 /*
3092 * commands 3115 * commands
3093 */ 3116 */
3094 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3095 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3096 break; 3119 break;
3097 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3098 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3099 break; 3122 break;
3100 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3101 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3102 break; 3125 break;
3103 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3104 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3105 break; 3128 break;
3106 case 5: /* raise window */ 3129 case 5: /* raise window */
3107 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3108 break; 3131 break;
3109 case 6: /* lower window */ 3132 case 6: /* lower window */
3110 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3111 break; 3134 break;
3112 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3113 scr_touch (true); 3136 scr_touch (true);
3114 break; 3137 break;
3115 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3118 break; 3141 break;
3119 3142
3120 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3121 default: 3144 default:
3122 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3123 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3124 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3125 break; 3148 break;
3126 3149
3127 /* 3150 /*
3128 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3129 */ 3152 */
3130 case 11: /* report window state */ 3153 case 11: /* report window state */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3133 break; 3156 break;
3134 case 13: /* report window position */ 3157 case 13: /* report window position */
3135 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3136 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3137 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3138 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3139 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3140 break; 3163 break;
3141 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3142 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3143 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3144 break; 3167 break;
3145 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3146 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3147 break; 3170 break;
… …
3149 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3150 break; 3173 break;
3151 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3152 { 3175 {
3153 char *s; 3176 char *s;
3154 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3155 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3156 XFree (s); 3179 XFree (s);
3157 } 3180 }
3158 break; 3181 break;
3159 case 21: /* report window title */ 3182 case 21: /* report window title */
3160 { 3183 {
3161 char *s; 3184 char *s;
3162 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3163 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3187 XFree (s);
3165 } 3188 }
3166 break; 3189 break;
3167 } 3190 }
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3247 */
3225void 3248void
3226rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3227{ 3250{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3251 /*
3232 * Not handled yet 3252 * Not handled yet
3233 */ 3253 */
3254
3255 unicode_t eh;
3234 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3235 if (s) 3257 if (s)
3236 free (s); 3258 free (s);
3237 3259
3238 return; 3260 return;
3239} 3261}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3266 */
3245void 3267void
3246rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3247{ 3269{
3248 unicode_t ch, eh;
3249 int arg; 3270 int arg;
3250 3271
3251 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3254 3275
3255 if (ch == ';') 3276 if (ch == ';')
3256 { 3277 {
3278 unicode_t eh;
3257 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3258 3280
3259 if (s) 3281 if (s)
3260 { 3282 {
3261 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3285 3307
3286/* 3308/*
3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3288 */ 3310 */
3289void 3311void
3290rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3291{ 3313{
3292 int color; 3314 int color;
3293 char *buf, *name; 3315 char *buf, *name;
3294 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3295 int saveop = op; 3317 int saveop = op;
… …
3322 unsigned long bytes_after; 3344 unsigned long bytes_after;
3323 unsigned char *value = 0; 3345 unsigned char *value = 0;
3324 const char *str = ""; 3346 const char *str = "";
3325 3347
3326 if (prop 3348 if (prop
3327 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3328 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3329 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3330 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3331 && actual_type != None 3353 && actual_type != None
3332 && actual_format == 8) 3354 && actual_format == 8)
… …
3336 3358
3337 XFree (value); 3359 XFree (value);
3338 } 3360 }
3339 else 3361 else
3340 { 3362 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3342 3364
3343 if (eq) 3365 if (eq)
3344 { 3366 {
3345 *eq = 0; 3367 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3347 } 3369 }
3348 else 3370 else
3349 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3350 display->atom (str)); 3372 display->atom (str));
3351 } 3373 }
3352 break; 3374 break;
3353 3375
3354 case XTerm_Color: 3376 case XTerm_Color:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3409 break;
3388 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3398 break; 3424 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3402 break; 3427 break;
3403 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
… …
3412 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3413 { 3438 {
3414 bool changed = false; 3439 bool changed = false;
3415 3440
3416 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420 3443
3421 if (changed) 3444 if (changed)
3422 update_background (); 3445 update_background ();
3423 } 3446 }
3424 3447
… …
3428#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3429 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3431 { 3454 {
3432 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3433 3465
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 h_scale, v_scale,
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 h_align, v_align);
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3470 }
3439 else 3471 else
3440 { 3472 {
3441 int changed = 0; 3473 bool changed = false;
3442 3474
3443 if (*str != ';') 3475 if (*str != ';')
3444 { 3476 {
3445 /* reset to default scaling :*/ 3477 if (image_vec.size () > 0)
3446 bgPixmap.unset_geometry (); 3478 changed = image_vec[0].set_file_geometry (str);
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3479 else
3480 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str))
3483 image_vec.pop_back ();
3484 else
3448 changed++; 3485 changed = true;
3449 str = strchr (str, ';'); 3486 }
3450 if (str == NULL)
3451 bgPixmap.set_defaultGeometry ();
3452 } 3487 }
3453 3488 else
3454 while (str)
3455 { 3489 {
3456 str++; 3490 str++;
3457 if (bgPixmap.set_geometry (str)) 3491 if (image_vec.size () > 0)
3458 changed++; 3492 changed = image_vec[0].set_geometry (str, true);
3459 str = strchr (str, ';');
3460 } 3493 }
3461 3494
3462 if (changed) 3495 if (changed)
3496 {
3497 if (bg_window_position_sensitive ())
3498 {
3499 int x, y;
3500 get_window_origin (x, y);
3501 bg_set_position (x, y);
3502 }
3463 update_background (); 3503 update_background ();
3504 }
3464 } 3505 }
3465 break; 3506 break;
3466#endif 3507#endif
3467 3508
3468 case XTerm_logfile: 3509 case XTerm_logfile:
… …
3555 * 's' = save 3596 * 's' = save
3556 * 'r' = restore 3597 * 'r' = restore
3557 * 't' = toggle 3598 * 't' = toggle
3558 * so no need for fancy checking 3599 * so no need for fancy checking
3559 */ 3600 */
3560int 3601int ecb_cold
3561rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3562{ 3603{
3563 int state; 3604 int state;
3564 3605
3565 if (mode == 's') 3606 if (mode == 's')
3566 { 3607 {
3567 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3568 return -1; 3612 return -1;
3569 } 3613 }
3570 else 3614 else
3571 { 3615 {
3572 if (mode == 'r') 3616 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3618 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3576 set_privmode (bit, state); 3620
3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3577 } 3625 }
3578 3626
3579 return state; 3627 return state;
3580} 3628}
3581 3629
3582/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3583void 3631void
3584rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3585{ 3633{
3586 unsigned int i, j; 3634 unsigned int i, j;
3587 int state; 3635 int state;
3588 3636
3589 static const struct 3637 static const struct
3590 { 3638 {
3591 const int argval; 3639 const int argval;
3592 const unsigned long bit; 3640 const unsigned long bit;
3593 } argtopriv[] = { 3641 } argtopriv[] = {
3594 { 1, PrivMode_aplCUR }, // DECCKM 3642 { 1, PrivMode_aplCUR }, // DECCKM
3595 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 }, // DECANM
3596 { 3, PrivMode_132 }, // DECCOLM 3644 { 3, PrivMode_132 }, // DECCOLM
3597 { 4, PrivMode_smoothScroll }, // DECSCLM 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3598 { 5, PrivMode_rVideo }, // DECSCNM 3646 { 5, PrivMode_rVideo }, // DECSCNM
3599 { 6, PrivMode_relOrigin }, // DECOM 3647 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3648 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3649 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3651 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3652 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3653 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3656#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK 3658 // 38, tektronix mode // DECTEK
3611 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3612 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3613 // 45 margin bell NYI 3661 // 45 margin bell NYI
3614 // 46 start logging 3662 // 46 start logging
3615 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3664 { 66, PrivMode_aplKP }, // DECNKM
3617#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3618 { 67, PrivMode_BackSpace }, // DECBKM 3666 { 67, PrivMode_BackSpace }, // DECBKM
3619#endif 3667#endif
3620 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3621 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
3622 { 1003, PrivMode_MouseAnyEvent }, 3670 { 1003, PrivMode_MouseAnyEvent },
3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste }, 3686 { 2004, PrivMode_BracketPaste },
3633 }; 3687 };
3634 3688
… …
3644 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3645 { 3699 {
3646 state = -1; 3700 state = -1;
3647 3701
3648 /* basic handling */ 3702 /* basic handling */
3649 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ecb_array_length (argtopriv); j++)
3650 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3651 { 3705 {
3652 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3653 break; 3707 break;
3654 } 3708 }
… …
3680 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3737 * within VT52 mode
3684 */ 3738 */
3685 set_privmode (PrivMode_vt52, 1); 3739 priv_modes |= PrivMode_vt52;
3686 break; 3740 break;
3687 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3744 break;
… …
3705 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3761 break;
3708#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3709 case scrollBar_esc: 3763 case scrollBar_esc:
3710 if (scrollBar.map (state)) 3764 scrollBar.map (state);
3711 {
3712 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3766 scr_touch (true);
3714 }
3715 break; 3767 break;
3716#endif 3768#endif
3717 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3718 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3719 break; 3771 break;
… …
3732 case 1003: 3784 case 1003:
3733 if (state) 3785 if (state)
3734 { 3786 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3787 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3788 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3789 mouse_row = mouse_col = 0;
3737 vt_emask_mouse = PointerMotionMask; 3790 vt_emask_mouse = PointerMotionMask;
3738 } 3791 }
3739 else 3792 else
3740 vt_emask_mouse = NoEventMask; 3793 vt_emask_mouse = NoEventMask;
3741 3794
… …
3773 } 3826 }
3774} 3827}
3775/*}}} */ 3828/*}}} */
3776 3829
3777/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3778void 3831void ecb_hot
3779rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3780{ 3833{
3781 unsigned int i; 3834 unsigned int i;
3782 short rendset; 3835 short rendset;
3783 int rendstyle; 3836 int rendstyle;
… …
3926 } 3979 }
3927 } 3980 }
3928} 3981}
3929/*}}} */ 3982/*}}} */
3930 3983
3931/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3932void
3933rxvt_term::process_graphics ()
3934{
3935 unicode_t ch, cmd = cmd_getc ();
3936
3937 if (cmd == 'Q')
3938 {
3939 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 3984/* ------------------------------------------------------------------------- */
3951 3985
3952/* 3986/*
3953 * Send printf () formatted output to the command. 3987 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 3988 * Only use for small amounts of data.
… …
3967 4001
3968/* ---------------------------------------------------------------------- */ 4002/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 4003/* Write data to the pty as typed by the user, pasted with the mouse,
3970 * or generated by us in response to a query ESC sequence. 4004 * or generated by us in response to a query ESC sequence.
3971 */ 4005 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4006static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973 4007
3974void 4008void
3975rxvt_term::tt_write (const char *data, unsigned int len) 4009rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 4010{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3982 4016
3983 if (v_buflen == 0) 4017 if (v_buflen == 0)
3984 { 4018 {
3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4019 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986 4020
4021 max_it (written, 0);
4022
3987 if ((unsigned int)written == len) 4023 if (written == len)
3988 return; 4024 return;
3989 4025
3990 data += written; 4026 data += written;
3991 len -= written; 4027 len -= written;
3992 } 4028 }
3993 4029
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4030 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4031
3996 memcpy (v_buffer + v_buflen, data, len); 4032 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4033 v_buflen += len;
3998 4034
3999 pty_ev.set (ev::READ | ev::WRITE); 4035 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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