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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 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
… …
1127 { 1113 {
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.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1132 1121
1133 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1135 1124
1136 w.stop (); 1125 w.stop ();
1137 } 1126 }
1138 1127
… …
1141 { 1130 {
1142 } 1131 }
1143} event_handler; 1132} event_handler;
1144#endif 1133#endif
1145 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
1146bool 1168bool
1147rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1148{ 1170{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1150 1172
1151 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1174
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1154 n = 0;
1155 } 1176 {
1156 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1160 1182
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1184
1163 if (r > 0) 1185 if (r > 0)
1164 { 1186 {
1165 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1166 return true; 1188 return true;
… …
1188{ 1210{
1189 make_current (); 1211 make_current ();
1190 1212
1191 if (revents & ev::READ) 1213 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1216 cmd_parse ();
1195 break;
1196 1217
1197 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1198 pty_write (); 1219 pty_write ();
1199 1220
1200 refresh_check (); 1221 refresh_check ();
1201} 1222}
1202 1223
1203void 1224void ecb_cold
1204rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1205{ 1226{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1228 recolour_cursor ();
1208 1229
… …
1213 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1214#endif 1235#endif
1215} 1236}
1216 1237
1217#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1218void 1239void ecb_cold
1219rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1220{ 1241{
1221 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1222 return; 1243 return;
1223 1244
… …
1225 XFlush (dpy); 1246 XFlush (dpy);
1226 1247
1227 hidden_pointer = 1; 1248 hidden_pointer = 1;
1228} 1249}
1229 1250
1230void 1251void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1253{
1233 make_current (); 1254 make_current ();
1234 1255
1235 pointer_blank (); 1256 pointer_blank ();
… …
1241{ 1262{
1242 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1243 int x, y; 1264 int x, y;
1244 int code = 32; 1265 int code = 32;
1245 1266
1246 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1248 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1249 { 1271 {
1250 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1251 return; 1273 return;
1274
1252 mouse_row = x; 1275 mouse_row = x;
1253 mouse_col = y; 1276 mouse_col = y;
1254 code += 32; 1277 code += 32;
1255 } 1278 }
1256 1279
… …
1259 else 1282 else
1260 { 1283 {
1261 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1286 if (button_number >= 3)
1264 button_number += (64 - 3); 1287 button_number += 64 - 3;
1265 } 1288 }
1266 1289
1267 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1268 { 1291 {
1269 /* 1292 /*
… …
1301 fputc ('A', stderr); 1324 fputc ('A', stderr);
1302 if (key_state & 32) 1325 if (key_state & 32)
1303 fputc ('2', stderr); 1326 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1328 button_number,
1306 x + 1, 1329 x,
1307 y + 1); 1330 y);
1308#endif 1331#endif
1309 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
1310 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1347 code + button_number + key_state,
1312 (32 + x + 1), 1348 32 + x,
1313 (32 + y + 1)); 1349 32 + y);
1314} 1350}
1315 1351
1316/*{{{ process an X event */ 1352/*{{{ process an X event */
1317void 1353void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1319{ 1355{
1320 make_current (); 1356 make_current ();
1321 1357
1322 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1457 focus_out ();
1422 break; 1458 break;
1423 1459
1424 case ConfigureNotify: 1460 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1429 { 1462 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 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 }
1432 1498
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1500 {
1435 seen_resize = 1; 1501 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1503 }
1438 else 1504 else
1439 { 1505 {
1440#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1507 if (moved)
1444 update_background (); 1508 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1509#endif
1449 } 1510 }
1450 1511
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1513 }
1453 break; 1514 break;
1454 1515
1455 case PropertyNotify: 1516 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1518 break;
1462 1519
1463 case SelectionClear: 1520 case SelectionClear:
1464 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1522 break;
1471 1523
1472 case SelectionRequest: 1524 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1474 break; 1526 break;
1475 1527
1476 case MapNotify: 1528 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1478 /* 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
1479 * non-reparenting window manager. In those cases we never get first 1531 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1534 * reparenting.
1483 * We should not render background immidiately, as there could be several 1535 * We should not render background immediately, as there could be several
1484 * 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
1485 * 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
1486 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1487 * 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
1488 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1489 */ 1541 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1492#endif 1544#endif
1493 mapped = 1; 1545 mapped = 1;
1494#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1511 { 1563 {
1512 do 1564 do
1513 { 1565 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1568 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1570
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1572
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1574 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1577 }
1526 1578
1527 want_refresh = 1; 1579 want_refresh = 1;
1528 } 1580 }
1529 else 1581 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1588 ;
1537 1589
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1591 {
1540 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1541 scrollBar.show (0); 1593 scrollBar.show (0);
1542 } 1594 }
1543 } 1595 }
1544 break; 1596 break;
1545 1597
… …
1611 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1612 } 1664 }
1613 else 1665 else
1614 { 1666 {
1615 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1669 }
1618 1670
1619 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1673 + 1;
… …
1633#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1634 } 1686 }
1635#endif 1687#endif
1636 } 1688 }
1637 } 1689 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1691 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1642 ; 1694 ;
1643 1695
1644 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1700 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1702 scrollBar.size ());
1651 want_refresh = 1; 1703 want_refresh = 1;
1652 scrollBar.show (1); 1704 scrollBar.show (1);
1653 } 1705 }
1654 break; 1706 break;
1655 } 1707 }
1656 1708
1657#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1667 }
1668#endif 1712#endif
1669 1713
1670#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1716 {
… …
1682#endif 1726#endif
1683 1727
1684 refresh_check (); 1728 refresh_check ();
1685} 1729}
1686 1730
1687void 1731#if ENABLE_FRILLS
1732void ecb_cold
1688rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1689{ 1734{
1690 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1691 return; 1736 return;
1692 1737
1693 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1694 { 1739 {
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1697 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1698 } 1744 }
1699} 1745}
1746#endif
1700 1747
1701void 1748void ecb_cold
1702rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1703{ 1750{
1704 if (!focus) 1751 if (!focus)
1705 { 1752 {
1706 focus = 1; 1753 focus = 1;
1707 want_refresh = 1; 1754 want_refresh = 1;
1708 1755
1709#if USE_XIM 1756#if USE_XIM
1710 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1711 { 1758 {
1712 IMSetPosition (); 1759 im_set_position ();
1713 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1714 } 1761 }
1715#endif 1762#endif
1716#if CURSOR_BLINK 1763#if CURSOR_BLINK
1717 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1731 1778
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733 } 1780 }
1734} 1781}
1735 1782
1736void 1783void ecb_cold
1737rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1738{ 1785{
1739 if (focus) 1786 if (focus)
1740 { 1787 {
1741 focus = 0; 1788 focus = 0;
… …
1774 1821
1775 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1776 } 1823 }
1777} 1824}
1778 1825
1779void 1826void ecb_cold
1780rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1781{ 1828{
1782#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1784 { 1831 {
… …
1788 } 1835 }
1789#endif 1836#endif
1790} 1837}
1791 1838
1792#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1793void 1840void ecb_hot
1794rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1795{ 1842{
1796 make_current (); 1843 make_current ();
1797 1844
1798 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1799 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1800 return; 1847 return;
1801 1848
1802# if ENABLE_TRANSPARENCY
1803 switch (ev.type) 1849 switch (ev.type)
1804 { 1850 {
1805 case PropertyNotify: 1851 case PropertyNotify:
1806 /* 1852 /*
1807 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1808 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1809 */ 1855 */
1810 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1811 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1812 { 1858 {
1859# if ENABLE_TRANSPARENCY
1813 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1814 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1815 } 1866 }
1816 1867
1817 break; 1868 break;
1818 } 1869 }
1819# endif
1820 1870
1821 refresh_check (); 1871 refresh_check ();
1822} 1872}
1823#endif 1873#endif
1824 1874
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1861 { 1911 {
1862 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1863 MEvent.clicks++; 1913 MEvent.clicks++;
1864 1914
1865 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1866 { 1916 {
1867 /* only report double clicks */ 1917 /* only report double clicks */
… …
1948 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1949 direction = UP; /* up */ 1999 direction = UP; /* up */
1950 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1951 direction = DN; /* down */ 2001 direction = DN; /* down */
1952 2002
1953 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1954 /* 2004 /*
1955 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1956 * move up if mouse is above slider 2006 * move up if mouse is above slider
1957 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1958 * 2008 *
… …
1997 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 2048#endif
1999 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2000 { 2050 {
2001 if (direction == UP) 2051 if (direction == UP)
2002 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2003 else 2053 else
2004 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2005 } 2055 }
2006 } 2056 }
2007 else 2057 else
2008 switch (ev.button) 2058 switch (ev.button)
2009 { 2059 {
2010 case Button2: 2060 case Button2:
2011 switch (scrollBar.align) 2061 switch (scrollBar.align)
2012 { 2062 {
2013 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2014 csrO = 0; 2064 csrO = 0;
2015 break; 2065 break;
2016 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2017 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2018 break; 2068 break;
2019 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2020 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2021 break; 2071 break;
2022 } 2072 }
2023 2073
2024 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2025 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2028 2078
2029 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2030 break; 2080 break;
2031 2081
2032 case Button1: 2082 case Button1:
2033 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2036 2086
2037 case Button3: 2087 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2039 { 2089 {
2040 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2041# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2042 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2043# else 2093# else
2044 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2045# endif 2095# endif
2046 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2047# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2048 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2049# else 2099# else
2050 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2051# endif 2101# endif
2052 else 2102 else
2053 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2054 } 2104 }
2055 else 2105 else
2056 { 2106 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2108 (nrow
2059 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2060 / scrollBar.size ())); 2110 / scrollBar.size ()));
2061 } 2111 }
2062 2112
2063 break; 2113 break;
2064 } 2114 }
… …
2075 2125
2076 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2077 if (!bypass_keystate) 2127 if (!bypass_keystate)
2078 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2079 2129
2080 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2081 { 2131 {
2082 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2083 scrollBar.show (0); 2133 scrollBar.show (0);
2084 } 2134 }
2085 2135
2086#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2087 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2137 case Button3: 2187 case Button3:
2138 selection_make (ev.time); 2188 selection_make (ev.time);
2139 break; 2189 break;
2140 2190
2141 case Button2: 2191 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2194 break;
2145 2195
2146#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2147 case Button4: 2197 case Button4:
2148 case Button5: 2198 case Button5:
… …
2182 } 2232 }
2183} 2233}
2184 2234
2185/*}}} */ 2235/*}}} */
2186 2236
2187bool 2237void ecb_hot
2188rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2189{ 2239{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2193 2242
2194 for (;;) 2243 for (;;)
2195 { 2244 {
2196 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2197 { 2246 {
2198 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2199 ch = next_char (); 2248 ch = next_char ();
2200 2249
2201 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2202 break; 2251 break;
2203 } 2252 }
2204 2253
2205 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2206 { 2255 {
2207 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2208 { 2257 {
2209 seen_input = 1; 2258 seen_input = 1;
2210 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2211 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2212 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2225 wchar_t *str = buf; 2274 wchar_t *str = buf;
2226 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2227 2276
2228 for (;;) 2277 for (;;)
2229 { 2278 {
2230 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2231 break; 2280 break;
2232 2281
2233 *str++ = ch; 2282 *str++ = ch;
2234 2283
2235 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2236 { 2285 {
2237 if (ch == C0_LF) 2286 if (ch == C0_LF)
2238 nlines++; 2287 nlines++;
2239 2288
2240 refresh_count++; 2289 refresh_count++;
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2291 */ 2340 */
2292 if (refreshnow) 2341 if (refreshnow)
2293 { 2342 {
2294 flag = true;
2295 scr_refresh (); 2343 scr_refresh ();
2296 want_refresh = 1; 2344 want_refresh = 1;
2297 } 2345 }
2298
2299 } 2346 }
2300 else 2347 else
2301 { 2348 {
2302 try 2349 try
2303 { 2350 {
… …
2311 } 2358 }
2312 2359
2313 ch = NOCHAR; 2360 ch = NOCHAR;
2314 } 2361 }
2315 } 2362 }
2316
2317 return flag;
2318} 2363}
2319 2364
2320// read the next character 2365// read the next character
2321wchar_t 2366wchar_t ecb_hot
2322rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2323{ 2368{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2370 {
2326 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2329 2374
2330 wchar_t wc; 2375 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2377
… …
2337 break; 2382 break;
2338 } 2383 }
2339 2384
2340 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2341 { 2386 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2389 }
2345 2390
2346 // assume wchar == unicode 2391 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
… …
2350 2395
2351 return NOCHAR; 2396 return NOCHAR;
2352} 2397}
2353 2398
2354// read the next octet 2399// read the next octet
2355uint32_t 2400uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2357{ 2402{
2358 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2405 : NOCHAR;
2361} 2406}
2362 2407
2363static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2364 2409
2365/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2412{
2373 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2374 2414
2375 if (c == NOCHAR) 2415 if (c == NOCHAR)
2376 throw out_of_input; 2416 throw out_of_input;
2377 2417
2378 return c; 2418 return c;
2379} 2419}
2380 2420
2381uint32_t 2421uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2423{
2384 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2385 2425
2386 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2390} 2430}
2391 2431
2392/*{{{ print pipe */ 2432/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2395FILE * 2435FILE * ecb_cold
2396rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2397{ 2437{
2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2439
2400 if (stream == NULL) 2440 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2442
2403 return stream; 2443 return stream;
2404} 2444}
2405 2445
2406int 2446int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2408{ 2448{
2409 fflush (stream); 2449 fflush (stream);
2410 return pclose (stream); 2450 return pclose (stream);
2411} 2451}
2412 2452
2413/* 2453/*
2414 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2415 */ 2455 */
2416void 2456void ecb_cold
2417rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2418{ 2458{
2419 FILE *fd = popen_printer (); 2459 FILE *fd = popen_printer ();
2420 2460
2421 if (!fd) 2461 if (!fd)
… …
2467 pclose_printer (fd); 2507 pclose_printer (fd);
2468} 2508}
2469#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2470/*}}} */ 2510/*}}} */
2471 2511
2472/* *INDENT-OFF* */
2473enum { 2512enum {
2474 C1_40 = 0x40, 2513 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2518};
2480/* *INDENT-ON* */
2481 2519
2482/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2483void 2521void ecb_hot
2484rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2523{
2486 switch (ch) 2524 switch (ch)
2487 { 2525 {
2488 case C0_ESC: 2526 case C0_ESC:
… …
2534} 2572}
2535/*}}} */ 2573/*}}} */
2536 2574
2537 2575
2538/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2539void 2577void ecb_cold
2540rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2541{ 2579{
2542 int row, col; 2580 int row, col;
2543 2581
2544 switch (ch) 2582 switch (ch)
… …
2578 break; 2616 break;
2579 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2619 break;
2582 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2621 priv_modes &= ~PrivMode_vt52;
2584 break; 2622 break;
2585 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2587 /* unimplemented */ 2625 /* unimplemented */
2588 break; 2626 break;
… …
2594} 2632}
2595/*}}} */ 2633/*}}} */
2596 2634
2597 2635
2598/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2599void 2637void ecb_hot
2600rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2601{ 2639{
2602 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2603 2641
2604 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2607 return; 2645 return;
2608 } 2646 }
2609 2647
2610 switch (ch) 2648 switch (ch)
2611 { 2649 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2650 case '#':
2614 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2615 scr_E (); 2652 scr_E ();
2616 break; 2653 break;
2617 case '(': 2654 case '(':
… …
2640#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2641 case '9': 2678 case '9':
2642 scr_forwardindex (); 2679 scr_forwardindex ();
2643 break; 2680 break;
2644#endif 2681#endif
2682 // DECPAM/DECPNM
2645 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2646 case '>': 2686 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2687 priv_modes &= ~PrivMode_aplKP;
2648 break; 2688 break;
2649 2689
2650 case C1_40: 2690 case C1_40:
2651 cmd_getc (); 2691 cmd_getc ();
2652 break; 2692 break;
… …
2656 2696
2657 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2659 { 2699 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2702 }
2663 break; 2703 break;
2664 2704
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2667 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2710 break;
2669 2711
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2677 scr_index (DN); 2719 scr_index (DN);
2678 break; 2720 break;
2679 2721
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2682 2724
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2685 2727
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2730 process_dcs_seq ();
2689 break; 2731 break;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
2695 2737
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2740 process_csi_seq ();
2699 break; 2741 break;
2700 2742
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2745 process_osc_seq ();
2704 break; 2746 break;
2705 2747
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2749 case 'c':
2708 mbstate.reset (); 2750 mbstate.reset ();
2709 scr_poweron (); 2751 scr_poweron ();
2710 scrollBar.show (1); 2752 scrollBar.show (1);
2711 break; 2753 break;
… …
2722 } 2764 }
2723} 2765}
2724/*}}} */ 2766/*}}} */
2725 2767
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2769enum {
2729 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2779};
2739 2780
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2786
2746const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
2747 { 2788 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2797 };
2757/* *INDENT-ON* */
2758 2798
2759void 2799void ecb_hot
2760rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2761{ 2801{
2762 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2763 unsigned int nargs, p; 2803 unsigned int nargs, p;
2764 int n, ndef; 2804 int n, ndef;
… …
2766 2806
2767 nargs = 0; 2807 nargs = 0;
2768 2808
2769 priv = 0; 2809 priv = 0;
2770 ch = cmd_getc (); 2810 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2812 {
2773 /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2814 priv = ch;
2775 ch = cmd_getc (); 2815 ch = cmd_getc ();
2776 } 2816 }
2777 2817
2778 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
2832 2872
2833 case '?': 2873 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2876 break;
2877
2878 case '!':
2879 if (ch == CSI_70)
2880 {
2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2882 scr_soft_reset ();
2883
2884 static const int pm_h[] = { 7, 25 };
2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2886
2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2837 } 2889 }
2890 break;
2891 }
2892
2838 return; 2893 return;
2839 } 2894 }
2840 2895
2841 switch (ch) 2896 switch (ch)
2842 { 2897 {
… …
2856 } 2911 }
2857 break; 2912 break;
2858#endif 2913#endif
2859 2914
2860 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2861 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2862 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2863 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2864 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2865 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2866 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2867 break; 2922 break;
2868 2923
2869 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2870 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3057 } 3112 }
3058} 3113}
3059/*}}} */ 3114/*}}} */
3060 3115
3061#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3062/* ARGSUSED */
3063void 3117void
3064rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3065{ 3119{
3066 int x, y; 3120 int x, y;
3067 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3076 { 3130 {
3077 /* 3131 /*
3078 * commands 3132 * commands
3079 */ 3133 */
3080 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3081 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3082 break; 3136 break;
3083 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3084 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3085 break; 3139 break;
3086 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3087 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3088 break; 3142 break;
3089 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3091 break; 3145 break;
3092 case 5: /* raise window */ 3146 case 5: /* raise window */
3093 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3094 break; 3148 break;
3095 case 6: /* lower window */ 3149 case 6: /* lower window */
3096 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3097 break; 3151 break;
3098 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3099 scr_touch (true); 3153 scr_touch (true);
3100 break; 3154 break;
3101 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3104 break; 3158 break;
3105 3159
3106 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3107 default: 3161 default:
3108 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3109 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3110 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3111 break; 3165 break;
3112 3166
3113 /* 3167 /*
3114 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3115 */ 3169 */
3116 case 11: /* report window state */ 3170 case 11: /* report window state */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3119 break; 3173 break;
3120 case 13: /* report window position */ 3174 case 13: /* report window position */
3121 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3122 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3123 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3124 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3125 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3126 break; 3180 break;
3127 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3128 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3130 break; 3184 break;
3131 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3132 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3133 break; 3187 break;
… …
3135 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3136 break; 3190 break;
3137 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3138 { 3192 {
3139 char *s; 3193 char *s;
3140 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3142 XFree (s); 3196 XFree (s);
3143 } 3197 }
3144 break; 3198 break;
3145 case 21: /* report window title */ 3199 case 21: /* report window title */
3146 { 3200 {
3147 char *s; 3201 char *s;
3148 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3204 XFree (s);
3151 } 3205 }
3152 break; 3206 break;
3153 } 3207 }
… …
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3264 */
3211void 3265void
3212rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3213{ 3267{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3268 /*
3218 * Not handled yet 3269 * Not handled yet
3219 */ 3270 */
3271
3272 unicode_t eh;
3220 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3221 if (s) 3274 if (s)
3222 free (s); 3275 free (s);
3223 3276
3224 return; 3277 return;
3225} 3278}
… …
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3283 */
3231void 3284void
3232rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3233{ 3286{
3234 unicode_t ch, eh;
3235 int arg; 3287 int arg;
3236 3288
3237 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3240 3292
3241 if (ch == ';') 3293 if (ch == ';')
3242 { 3294 {
3295 unicode_t eh;
3243 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3244 3297
3245 if (s) 3298 if (s)
3246 { 3299 {
3247 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3271 3324
3272/* 3325/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3327 */
3275void 3328void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3330{
3278 int color; 3331 int color;
3279 char *buf, *name; 3332 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3334 int saveop = op;
… …
3308 unsigned long bytes_after; 3361 unsigned long bytes_after;
3309 unsigned char *value = 0; 3362 unsigned char *value = 0;
3310 const char *str = ""; 3363 const char *str = "";
3311 3364
3312 if (prop 3365 if (prop
3313 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3314 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3315 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3316 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3317 && actual_type != None 3370 && actual_type != None
3318 && actual_format == 8) 3371 && actual_format == 8)
… …
3322 3375
3323 XFree (value); 3376 XFree (value);
3324 } 3377 }
3325 else 3378 else
3326 { 3379 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3328 3381
3329 if (eq) 3382 if (eq)
3330 { 3383 {
3331 *eq = 0; 3384 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3333 } 3386 }
3334 else 3387 else
3335 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3336 display->atom (str)); 3389 display->atom (str));
3337 } 3390 }
3338 break; 3391 break;
3339 3392
3340 case XTerm_Color: 3393 case XTerm_Color:
… …
3372 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3373 break; 3426 break;
3374 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3375 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3376 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3377#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3378 case XTerm_Color_RV:
3379 process_color_seq (op, Color_RV, str, resp);
3380 break;
3381 case Rxvt_Color_BD:
3382 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3383 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3384 break; 3441 break;
3385 case Rxvt_Color_UL:
3386 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3387 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3388 break; 3444 break;
3389 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3391 break; 3447 break;
3392#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3393#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3396 { 3455 {
3397 bool changed = false; 3456 bool changed = false;
3398 3457
3399 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3400 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3401 else
3402 changed = bgPixmap.unset_tint ();
3403 3460
3404 if (changed) 3461 if (changed)
3405 update_background (); 3462 update_background ();
3406 } 3463 }
3407 3464
… …
3411#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3412 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3414 { 3471 {
3415 char str[256]; 3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale;
3478 v_scale = image_vec[0].v_scale;
3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3416 3482
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3483 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3487 }
3422 else 3488 else
3423 { 3489 {
3424 int changed = 0; 3490 bool changed = false;
3425 3491
3426 if (*str != ';') 3492 if (*str != ';')
3427 { 3493 {
3428 /* reset to default scaling :*/ 3494 if (image_vec.size () > 0)
3429 bgPixmap.unset_geometry (); 3495 changed = image_vec[0].set_file_geometry (str);
3430 if (bgPixmap.set_file (str)) /* change pixmap */ 3496 else
3497 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3431 changed++; 3502 changed = true;
3432 str = strchr (str, ';'); 3503 }
3433 if (str == NULL)
3434 bgPixmap.set_defaultGeometry ();
3435 } 3504 }
3436 3505 else
3437 while (str)
3438 { 3506 {
3439 str++; 3507 str++;
3440 if (bgPixmap.set_geometry (str)) 3508 if (image_vec.size () > 0)
3441 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3442 str = strchr (str, ';');
3443 } 3510 }
3444 3511
3445 if (changed) 3512 if (changed)
3513 {
3514 if (bg_window_position_sensitive ())
3515 {
3516 int x, y;
3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3446 update_background (); 3520 update_background ();
3521 }
3447 } 3522 }
3448 break; 3523 break;
3449#endif 3524#endif
3450 3525
3451 case XTerm_logfile: 3526 case XTerm_logfile:
… …
3538 * 's' = save 3613 * 's' = save
3539 * 'r' = restore 3614 * 'r' = restore
3540 * 't' = toggle 3615 * 't' = toggle
3541 * so no need for fancy checking 3616 * so no need for fancy checking
3542 */ 3617 */
3543int 3618int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3620{
3546 int state; 3621 int state;
3547 3622
3548 if (mode == 's') 3623 if (mode == 's')
3549 { 3624 {
3550 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3551 return -1; 3629 return -1;
3552 } 3630 }
3553 else 3631 else
3554 { 3632 {
3555 if (mode == 'r') 3633 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3635 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 set_privmode (bit, state); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3560 } 3642 }
3561 3643
3562 return state; 3644 return state;
3563} 3645}
3564 3646
3565/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3566void 3648void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3650{
3569 unsigned int i, j; 3651 unsigned int i, j;
3570 int state; 3652 int state;
3571 3653
3572 static const struct 3654 static const struct
3573 { 3655 {
3574 const int argval; 3656 const int argval;
3575 const unsigned long bit; 3657 const unsigned long bit;
3576 } argtopriv[] = { 3658 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
3587 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3673#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3678 // 45 margin bell NYI
3595 // 46 start logging 3679 // 46 start logging
3596 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3684#endif
3601 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3687 { 1003, PrivMode_MouseAnyEvent },
3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3613 { 2004, PrivMode_BracketPaste }, 3703 { 2004, PrivMode_BracketPaste },
3614 }; 3704 };
3615 3705
… …
3625 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3626 { 3716 {
3627 state = -1; 3717 state = -1;
3628 3718
3629 /* basic handling */ 3719 /* basic handling */
3630 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3631 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3632 { 3722 {
3633 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3634 break; 3724 break;
3635 } 3725 }
… …
3643 3733
3644 scr_touch (true); 3734 scr_touch (true);
3645 break; 3735 break;
3646#endif 3736#endif
3647 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3739 if (mode == 0)
3651 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
3652 else if (mode == 1) 3741 else if (mode == 1)
3653 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
… …
3662 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3663 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3664 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3665 * within VT52 mode 3754 * within VT52 mode
3666 */ 3755 */
3667 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3668 break; 3757 break;
3669 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3761 break;
3676 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
3678 break; 3764 break;
3679 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
3690 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3691 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3692 break; 3778 break;
3693#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3694 case scrollBar_esc: 3780 case scrollBar_esc:
3695 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3696 {
3697 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3698 scr_touch (true); 3783 scr_touch (true);
3699 }
3700 break; 3784 break;
3701#endif 3785#endif
3702 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3703 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3704 break; 3788 break;
… …
3717 case 1003: 3801 case 1003:
3718 if (state) 3802 if (state)
3719 { 3803 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3722 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3723 } 3808 }
3724 else 3809 else
3725 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3811
3726 vt_select_input (); 3812 vt_select_input ();
3727 break; 3813 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3816 break;
3731 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3819 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3822 if (!state)
3737 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
3738 scr_change_screen (state); 3825 scr_change_screen (state);
3739 break; 3826 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
3741 scr_change_screen (state); 3832 scr_change_screen (state);
3833
3742 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3835 if (state)
3744 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
3745 break; 3839 break;
3746 default: 3840 default:
3747 break; 3841 break;
3748 } 3842 }
3749 } 3843 }
3750} 3844}
3751/*}}} */ 3845/*}}} */
3752 3846
3753/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3754void 3848void ecb_hot
3755rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3756{ 3850{
3757 unsigned int i; 3851 unsigned int i;
3758 short rendset; 3852 short rendset;
3759 int rendstyle; 3853 int rendstyle;
… …
3902 } 3996 }
3903 } 3997 }
3904} 3998}
3905/*}}} */ 3999/*}}} */
3906 4000
3907/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3908void
3909rxvt_term::process_graphics ()
3910{
3911 unicode_t ch, cmd = cmd_getc ();
3912
3913 if (cmd == 'Q')
3914 {
3915 /* query graphics */
3916 tt_printf ("\033G0\012"); /* no graphics */
3917 return;
3918 }
3919 /* swallow other graphics sequences until terminating ':' */
3920 do
3921 ch = cmd_getc ();
3922 while (ch != ':');
3923}
3924/*}}} */
3925
3926/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3927 4002
3928/* 4003/*
3929 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3930 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3943 4018
3944/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3945/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3946 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3947 */ 4022 */
3948const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3949 4024
3950void 4025void
3951rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3952{ 4027{
3953 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3958 4033
3959 if (v_buflen == 0) 4034 if (v_buflen == 0)
3960 { 4035 {
3961 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3962 4037
4038 max_it (written, 0);
4039
3963 if ((unsigned int)written == len) 4040 if (written == len)
3964 return; 4041 return;
3965 4042
3966 data += written; 4043 data += written;
3967 len -= written; 4044 len -= written;
3968 } 4045 }
3969 4046
3970 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3971 4048
3972 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len; 4050 v_buflen += len;
3974 4051
3975 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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