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.450 by sf-exg, Sun Apr 18 11:11:28 2010 UTC vs.
Revision 1.538 by sf-exg, Thu Apr 11 08:13:43 2013 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
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, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
406{ 407{
407 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
408 KeySym keysym; 409 KeySym keysym;
409 int valid_keysym; 410 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
426 427
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
509#endif 510#endif
510 max_it (lnsppg, 1); 511 max_it (lnsppg, 1);
511 512
512 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
513 { 514 {
514 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
515 return; 516 return;
516 } 517 }
517 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
518 { 519 {
519 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
520 return; 521 return;
521 } 522 }
522 } 523 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
525 { 526 {
526 if (keysym == XK_Up) 527 if (keysym == XK_Up)
527 { 528 {
528 scr_page (UP, 1); 529 scr_page (1);
529 return; 530 return;
530 } 531 }
531 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
532 { 533 {
533 scr_page (DN, 1); 534 scr_page (-1);
534 return; 535 return;
535 } 536 }
536 } 537 }
537#endif 538#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
540 { 541 {
541 if (keysym == XK_Home) 542 if (keysym == XK_Home)
542 { 543 {
543 scr_move_to (0, 1); 544 scr_changeview (top_row);
544 return; 545 return;
545 } 546 }
546 else if (keysym == XK_End) 547 else if (keysym == XK_End)
547 { 548 {
548 scr_move_to (1, 1); 549 scr_changeview (0);
549 return; 550 return;
550 } 551 }
551 } 552 }
552#endif 553#endif
553 } 554 }
… …
569 selection_request (ev.time); 570 selection_request (ev.time);
570 return; 571 return;
571#if TODO 572#if TODO
572 /* rxvt extras */ 573 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 575 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 577 return;
579#endif 578#endif
580 } 579 }
581 } 580 }
582 } 581 }
… …
781 } 780 }
782 781
783 if (newlen) 782 if (newlen)
784 len = strlen (kbuf); 783 len = strlen (kbuf);
785 784
785 if (len > 0)
786 {
786 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
787 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
788 */ 801 */
789#ifdef META8_OPTION 802#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
792#endif 805#endif
806 }
793 807
794 } 808 }
795 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
796 { 810 {
797 len = 1; 811 len = 1;
… …
831 { 845 {
832 view_start = 0; 846 view_start = 0;
833 want_refresh = 1; 847 want_refresh = 1;
834 } 848 }
835 849
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 850 /* escape prefix */
851 if (meta 851 if (meta
852#ifdef META8_OPTION 852#ifdef META8_OPTION
853 && meta_char == C0_ESC 853 && meta_char == C0_ESC
854#endif 854#endif
… …
859 } 859 }
860 860
861 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
862} 862}
863 863
864void 864void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
866{ 866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 868 KeySym keysym;
869 869
… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
980 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 950 scr_touch (false);
984 } 951 }
985#endif 952#endif
986 953
987 if (want_refresh) 954 if (want_refresh)
… …
1024 while (row < end_row); 991 while (row < end_row);
1025 } 992 }
1026 993
1027 scr_refresh (); 994 scr_refresh ();
1028 scrollBar.show (1); 995 scrollBar.show (1);
1029#ifdef USE_XIM 996#if USE_XIM
1030 IMSendSpot (); 997 im_send_spot ();
1031#endif 998#endif
1032 } 999 }
1033 1000
1034 display->flush (); 1001 display->flush ();
1035} 1002}
… …
1053 flush (); 1020 flush ();
1054} 1021}
1055 1022
1056#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1057void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1041{
1060 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1043 want_refresh = 1;
1062 refresh_check (); 1044 refresh_check ();
… …
1080 1062
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1064void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1066{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1069 {
1088 want_refresh = 1; 1070 want_refresh = 1;
1089 refresh_check (); 1071 refresh_check ();
1090 } 1072 }
1091 else 1073 else
… …
1152 { 1134 {
1153 } 1135 }
1154} event_handler; 1136} event_handler;
1155#endif 1137#endif
1156 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1157bool 1172bool
1158rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1159{ 1174{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1161 1176
1162 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1178
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1165 n = 0;
1166 } 1180 {
1167 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1171 1186
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1188
1174 if (r > 0) 1189 if (r > 0)
1175 { 1190 {
1176 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1177 return true; 1192 return true;
… …
1208 pty_write (); 1223 pty_write ();
1209 1224
1210 refresh_check (); 1225 refresh_check ();
1211} 1226}
1212 1227
1213void 1228void ecb_cold
1214rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1215{ 1230{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1232 recolour_cursor ();
1218 1233
… …
1223 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1224#endif 1239#endif
1225} 1240}
1226 1241
1227#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1228void 1243void ecb_cold
1229rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1230{ 1245{
1231 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1232 return; 1247 return;
1233 1248
… …
1235 XFlush (dpy); 1250 XFlush (dpy);
1236 1251
1237 hidden_pointer = 1; 1252 hidden_pointer = 1;
1238} 1253}
1239 1254
1240void 1255void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1257{
1243 make_current (); 1258 make_current ();
1244 1259
1245 pointer_blank (); 1260 pointer_blank ();
… …
1251{ 1266{
1252 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1253 int x, y; 1268 int x, y;
1254 int code = 32; 1269 int code = 32;
1255 1270
1256 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1258 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1259 { 1275 {
1260 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1261 return; 1277 return;
1278
1262 mouse_row = x; 1279 mouse_row = x;
1263 mouse_col = y; 1280 mouse_col = y;
1264 code += 32; 1281 code += 32;
1265 } 1282 }
1266 1283
… …
1269 else 1286 else
1270 { 1287 {
1271 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1290 if (button_number >= 3)
1274 button_number += (64 - 3); 1291 button_number += 64 - 3;
1275 } 1292 }
1276 1293
1277 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1278 { 1295 {
1279 /* 1296 /*
… …
1311 fputc ('A', stderr); 1328 fputc ('A', stderr);
1312 if (key_state & 32) 1329 if (key_state & 32)
1313 fputc ('2', stderr); 1330 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1332 button_number,
1316 x + 1, 1333 x,
1317 y + 1); 1334 y);
1318#endif 1335#endif
1319 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1320 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1351 code + button_number + key_state,
1322 (32 + x + 1), 1352 32 + x,
1323 (32 + y + 1)); 1353 32 + y);
1324} 1354}
1325 1355
1326/*{{{ process an X event */ 1356/*{{{ process an X event */
1327void 1357void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1329{ 1359{
1330 make_current (); 1360 make_current ();
1331 1361
1332 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1461 focus_out ();
1432 break; 1462 break;
1433 1463
1434 case ConfigureNotify: 1464 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1439 { 1466 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1442 1502
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1504 {
1445 seen_resize = 1; 1505 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1507 }
1448 else 1508 else
1449 { 1509 {
1450#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped) 1511 if (moved)
1454 update_background (); 1512 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif 1513#endif
1459 } 1514 }
1460 1515
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1517 }
1463 break; 1518 break;
1464 1519
1465 case PropertyNotify: 1520 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1522 break;
1472 1523
1473 case SelectionClear: 1524 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1526 break;
1476 1527
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1528 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1484 break; 1530 break;
1485 1531
1486 case MapNotify: 1532 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1489 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1492 * reparenting. 1538 // events at startup when the window manager reparents the
1493 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1495 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1502#endif 1543#endif
1503 mapped = 1; 1544 mapped = 1;
1504#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1521 { 1562 {
1522 do 1563 do
1523 { 1564 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1567 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1569
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1571
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1573 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1576 }
1536 1577
1537 want_refresh = 1; 1578 want_refresh = 1;
1538 } 1579 }
1539 else 1580 else
… …
1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1546 ; 1587 ;
1547 1588
1548 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1549 { 1590 {
1550 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1551 scrollBar.show (0); 1592 scrollBar.show (0);
1552 } 1593 }
1553 } 1594 }
1554 break; 1595 break;
1555 1596
… …
1621 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1622 } 1663 }
1623 else 1664 else
1624 { 1665 {
1625 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1626 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1627 } 1668 }
1628 1669
1629 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1630 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1; 1672 + 1;
… …
1643#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1644 } 1685 }
1645#endif 1686#endif
1646 } 1687 }
1647 } 1688 }
1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1649 { 1690 {
1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1651 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1652 ; 1693 ;
1653 1694
1654 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1655 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1658 &unused_mask); 1699 &unused_mask);
1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1660 scrollBar.size ()); 1701 scrollBar.size ());
1661 want_refresh = 1; 1702 want_refresh = 1;
1662 scrollBar.show (1); 1703 scrollBar.show (1);
1663 } 1704 }
1664 break; 1705 break;
1665 } 1706 }
1666 1707
1667#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1668 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1677 }
1678#endif 1711#endif
1679 1712
1680#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1715 {
… …
1693 1726
1694 refresh_check (); 1727 refresh_check ();
1695} 1728}
1696 1729
1697#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1698void 1731void ecb_cold
1699rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1700{ 1733{
1701 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1702 return; 1735 return;
1703 1736
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1738 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1740 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1709 } 1743 }
1710} 1744}
1711#endif 1745#endif
1712 1746
1713void 1747void ecb_cold
1714rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1715{ 1749{
1716 if (!focus) 1750 if (!focus)
1717 { 1751 {
1718 focus = 1; 1752 focus = 1;
1719 want_refresh = 1; 1753 want_refresh = 1;
1720 1754
1721#if USE_XIM 1755#if USE_XIM
1722 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1723 { 1757 {
1724 IMSetPosition (); 1758 im_set_position ();
1725 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1726 } 1760 }
1727#endif 1761#endif
1728#if CURSOR_BLINK 1762#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1743 1777
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 } 1779 }
1746} 1780}
1747 1781
1748void 1782void ecb_cold
1749rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1750{ 1784{
1751 if (focus) 1785 if (focus)
1752 { 1786 {
1753 focus = 0; 1787 focus = 0;
… …
1786 1820
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 } 1822 }
1789} 1823}
1790 1824
1791void 1825void ecb_cold
1792rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1793{ 1827{
1794#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1796 { 1830 {
… …
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 } 1834 }
1801#endif 1835#endif
1802} 1836}
1803 1837
1804#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1805void 1839void ecb_hot
1806rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1841{
1808 make_current (); 1842 make_current ();
1809 1843
1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return; 1846 return;
1813 1847
1814# if ENABLE_TRANSPARENCY
1815 switch (ev.type) 1848 switch (ev.type)
1816 { 1849 {
1817 case PropertyNotify: 1850 case PropertyNotify:
1818 /* 1851 /*
1819 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1820 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1821 */ 1854 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1857 {
1825 bgPixmap.set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1826 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1827 } 1866 }
1828 1867
1829 break; 1868 break;
1830 } 1869 }
1831# endif
1832 1870
1833 refresh_check (); 1871 refresh_check ();
1834} 1872}
1835#endif 1873#endif
1836 1874
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1873 { 1911 {
1874 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1875 MEvent.clicks++; 1913 MEvent.clicks++;
1876 1914
1877 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1878 { 1916 {
1879 /* only report double clicks */ 1917 /* only report double clicks */
… …
1960 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */ 1999 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */ 2001 direction = DN; /* down */
1964 2002
1965 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1966 /* 2004 /*
1967 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 2006 * move up if mouse is above slider
1969 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1970 * 2008 *
… …
2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2010#endif 2048#endif
2011 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2012 { 2050 {
2013 if (direction == UP) 2051 if (direction == UP)
2014 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2015 else 2053 else
2016 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2017 } 2055 }
2018 } 2056 }
2019 else 2057 else
2020 switch (ev.button) 2058 switch (ev.button)
2021 { 2059 {
2022 case Button2: 2060 case Button2:
2023 switch (scrollBar.align) 2061 switch (scrollBar.align)
2024 { 2062 {
2025 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2026 csrO = 0; 2064 csrO = 0;
2027 break; 2065 break;
2028 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2029 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2030 break; 2068 break;
2031 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2032 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2033 break; 2071 break;
2034 } 2072 }
2035 2073
2036 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2037 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2038 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2040 2078
2041 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2042 break; 2080 break;
2043 2081
2044 case Button1: 2082 case Button1:
2045 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2046 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2047 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2048 2086
2049 case Button3: 2087 case Button3:
2050 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2051 { 2089 {
2052 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2053# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2054 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2055# else 2093# else
2056 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2057# endif 2095# endif
2058 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2060 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2061# else 2099# else
2062 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2063# endif 2101# endif
2064 else 2102 else
2065 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2066 } 2104 }
2067 else 2105 else
2068 { 2106 {
2069 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2070 (nrow 2108 (nrow
2071 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2072 / scrollBar.size ())); 2110 / scrollBar.size ()));
2073 } 2111 }
2074 2112
2075 break; 2113 break;
2076 } 2114 }
… …
2087 2125
2088 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2089 if (!bypass_keystate) 2127 if (!bypass_keystate)
2090 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2091 2129
2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2093 { 2131 {
2094 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2095 scrollBar.show (0); 2133 scrollBar.show (0);
2096 } 2134 }
2097 2135
2098#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2099 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2149 case Button3: 2187 case Button3:
2150 selection_make (ev.time); 2188 selection_make (ev.time);
2151 break; 2189 break;
2152 2190
2153 case Button2: 2191 case Button2:
2154 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?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2194 break;
2157 2195
2158#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2159 case Button4: 2197 case Button4:
2160 case Button5: 2198 case Button5:
2161 { 2199 {
2162 int i; 2200 int lines;
2163 page_dirn v; 2201 page_dirn dirn;
2164 2202
2165 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2166 2204
2167 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2168 i = 1; 2206 lines = 1;
2169 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2170 i = nrow - 1; 2208 lines = nrow - 1;
2171 else 2209 else
2172 i = 5; 2210 lines = 5;
2173 2211
2174# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2175 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2176 { 2214 {
2177 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2180 2218
2181 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2183 } 2221 }
2184 else 2222 else
2185# endif 2223# endif
2186 { 2224 {
2187 scr_page (v, i); 2225 scr_page (dirn, lines);
2188 scrollBar.show (1); 2226 scrollBar.show (1);
2189 } 2227 }
2190 } 2228 }
2191 break; 2229 break;
2192#endif 2230#endif
… …
2194 } 2232 }
2195} 2233}
2196 2234
2197/*}}} */ 2235/*}}} */
2198 2236
2199void 2237void ecb_hot
2200rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2201{ 2239{
2202 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2204 2242
2205 for (;;) 2243 for (;;)
2206 { 2244 {
2207 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2208 { 2246 {
2209 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2210 ch = next_char (); 2248 ch = next_char ();
2211 2249
2212 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2213 break; 2251 break;
2214 } 2252 }
2215 2253
2216 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))
2217 { 2255 {
2218 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2219 { 2257 {
2220 seen_input = 1; 2258 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2236 wchar_t *str = buf; 2274 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238 2276
2239 for (;;) 2277 for (;;)
2240 { 2278 {
2241 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)))
2242 break; 2280 break;
2243 2281
2244 *str++ = ch; 2282 *str++ = ch;
2245 2283
2246 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2247 { 2285 {
2248 if (ch == C0_LF) 2286 if (ch == C0_LF)
2249 nlines++; 2287 nlines++;
2250 2288
2251 refresh_count++; 2289 refresh_count++;
… …
2323 } 2361 }
2324 } 2362 }
2325} 2363}
2326 2364
2327// read the next character 2365// read the next character
2328wchar_t 2366wchar_t ecb_hot
2329rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2330{ 2368{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2370 {
2333 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2336 2374
2337 wchar_t wc; 2375 wchar_t wc;
2338 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);
2339 2377
… …
2345 } 2383 }
2346 2384
2347 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2348 { 2386 {
2349 mbstate.reset (); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 } 2391 }
2352 2392
2353 // assume wchar == unicode 2393 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
… …
2357 2397
2358 return NOCHAR; 2398 return NOCHAR;
2359} 2399}
2360 2400
2361// read the next octet 2401// read the next octet
2362uint32_t 2402uint32_t ecb_hot
2363rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2364{ 2404{
2365 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2366 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2367 : NOCHAR; 2407 : NOCHAR;
2368} 2408}
2369 2409
2370static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2371 2411
2372/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2414{
2380 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2381 2416
2382 if (c == NOCHAR) 2417 if (c == NOCHAR)
2383 throw out_of_input; 2418 throw out_of_input;
2384 2419
2385 return c; 2420 return c;
2386} 2421}
2387 2422
2388uint32_t 2423uint32_t ecb_hot
2389rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2390{ 2425{
2391 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2392 2427
2393 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2397} 2432}
2398 2433
2399/*{{{ print pipe */ 2434/*{{{ print pipe */
2400/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2402FILE * 2437FILE * ecb_cold
2403rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2404{ 2439{
2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2441
2407 if (stream == NULL) 2442 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2444
2410 return stream; 2445 return stream;
2411} 2446}
2412 2447
2413int 2448int ecb_cold
2414rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2415{ 2450{
2416 fflush (stream); 2451 fflush (stream);
2417 return pclose (stream); 2452 return pclose (stream);
2418} 2453}
2419 2454
2420/* 2455/*
2421 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2422 */ 2457 */
2423void 2458void ecb_cold
2424rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2425{ 2460{
2426 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2427 2462
2428 if (!fd) 2463 if (!fd)
… …
2474 pclose_printer (fd); 2509 pclose_printer (fd);
2475} 2510}
2476#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2477/*}}} */ 2512/*}}} */
2478 2513
2479/* *INDENT-OFF* */
2480enum { 2514enum {
2481 C1_40 = 0x40, 2515 C1_40 = 0x40,
2482 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2483 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2484 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2485 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2486}; 2520};
2487/* *INDENT-ON* */
2488 2521
2489/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2490void 2523void ecb_hot
2491rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2492{ 2525{
2493 switch (ch) 2526 switch (ch)
2494 { 2527 {
2495 case C0_ESC: 2528 case C0_ESC:
… …
2541} 2574}
2542/*}}} */ 2575/*}}} */
2543 2576
2544 2577
2545/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2546void 2579void ecb_cold
2547rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2548{ 2581{
2549 int row, col; 2582 int row, col;
2550 2583
2551 switch (ch) 2584 switch (ch)
… …
2585 break; 2618 break;
2586 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2588 break; 2621 break;
2589 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2590 set_privmode (PrivMode_vt52, 0); 2623 priv_modes &= ~PrivMode_vt52;
2591 break; 2624 break;
2592 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2593 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2594 /* unimplemented */ 2627 /* unimplemented */
2595 break; 2628 break;
… …
2601} 2634}
2602/*}}} */ 2635/*}}} */
2603 2636
2604 2637
2605/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2606void 2639void ecb_hot
2607rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2608{ 2641{
2609 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2610 2643
2611 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2614 return; 2647 return;
2615 } 2648 }
2616 2649
2617 switch (ch) 2650 switch (ch)
2618 { 2651 {
2619 /* case 1: do_tek_mode (); break; */
2620 case '#': 2652 case '#':
2621 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2622 scr_E (); 2654 scr_E ();
2623 break; 2655 break;
2624 case '(': 2656 case '(':
… …
2647#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2648 case '9': 2680 case '9':
2649 scr_forwardindex (); 2681 scr_forwardindex ();
2650 break; 2682 break;
2651#endif 2683#endif
2684 // DECPAM/DECPNM
2652 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2653 case '>': 2688 case '>':
2654 set_privmode (PrivMode_aplKP, ch == '='); 2689 priv_modes &= ~PrivMode_aplKP;
2655 break; 2690 break;
2656 2691
2657 case C1_40: 2692 case C1_40:
2658 cmd_getc (); 2693 cmd_getc ();
2659 break; 2694 break;
… …
2663 2698
2664 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2666 { 2701 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2669 } 2704 }
2670 break; 2705 break;
2671 2706
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
2674 process_graphics (); 2709 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q')
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2712 break;
2676 2713
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2716 scr_set_tab (1);
… …
2683 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2684 scr_index (DN); 2721 scr_index (DN);
2685 break; 2722 break;
2686 2723
2687 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2688 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2689 2726
2690 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2691 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2692 2729
2693 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2694 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2695 process_dcs_seq (); 2732 process_dcs_seq ();
2696 break; 2733 break;
… …
2729 } 2766 }
2730} 2767}
2731/*}}} */ 2768/*}}} */
2732 2769
2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2734/* *INDENT-OFF* */
2735enum { 2771enum {
2736 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2773 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2774 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2775 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2778 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2779 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2780 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2781};
2746 2782
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2783#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2784 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2785 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2786#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2787 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2788
2753const unsigned char csi_defaults[] = 2789static const unsigned char csi_defaults[] =
2754 { 2790 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2791 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2792 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2793 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2794 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2795 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2763 }; 2799 };
2764/* *INDENT-ON* */
2765 2800
2766void 2801void ecb_hot
2767rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2768{ 2803{
2769 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2770 unsigned int nargs, p; 2805 unsigned int nargs, p;
2771 int n, ndef; 2806 int n, ndef;
2772 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2773 2808
2774 nargs = 0; 2809 nargs = 0;
… …
2780 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2781 priv = ch; 2816 priv = ch;
2782 ch = cmd_getc (); 2817 ch = cmd_getc ();
2783 } 2818 }
2784 2819
2820 prev_ch = 0;
2785 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2786 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2787 { 2823 {
2788 if (isdigit (ch)) 2824 if (isdigit (ch))
2789 { 2825 {
… …
2799 n = -1; 2835 n = -1;
2800 } 2836 }
2801 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2802 process_nonprinting (ch); 2838 process_nonprinting (ch);
2803 2839
2840 prev_ch = ch;
2804 ch = cmd_getc (); 2841 ch = cmd_getc ();
2805 } 2842 }
2806 2843
2807 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2808 return; 2845 return;
… …
2847 { 2884 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2886 scr_soft_reset ();
2850 2887
2851 static const int pm_h[] = { 7, 25 }; 2888 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2890
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2893 }
2857 break; 2894 break;
2858 } 2895 }
2859 2896
2860 return; 2897 return;
… …
2878 } 2915 }
2879 break; 2916 break;
2880#endif 2917#endif
2881 2918
2882 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2883 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2884 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2885 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2886 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2887 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2888 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2889 break; 2926 break;
2890 2927
2891 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2892 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3042 scr_insert_mode (1); 3079 scr_insert_mode (1);
3043 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3044 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3045 break; 3082 break;
3046 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3047 /* 3089 /*
3048 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3049 */ 3091 */
3050 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3051 if (nargs == 1) 3093 if (nargs == 1)
… …
3079 } 3121 }
3080} 3122}
3081/*}}} */ 3123/*}}} */
3082 3124
3083#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3084/* ARGSUSED */
3085void 3126void
3086rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3087{ 3128{
3088 int x, y; 3129 int x, y;
3089 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
… …
3098 { 3139 {
3099 /* 3140 /*
3100 * commands 3141 * commands
3101 */ 3142 */
3102 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3104 break; 3145 break;
3105 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3148 break;
3108 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3151 break;
3111 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3154 break;
3114 case 5: /* raise window */ 3155 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3116 break; 3157 break;
3117 case 6: /* lower window */ 3158 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3119 break; 3160 break;
3120 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3121 scr_touch (true); 3162 scr_touch (true);
3122 break; 3163 break;
3123 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
… …
3126 break; 3167 break;
3127 3168
3128 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3129 default: 3170 default:
3130 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3131 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3132 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3133 break; 3174 break;
3134 3175
3135 /* 3176 /*
3136 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3137 */ 3178 */
3138 case 11: /* report window state */ 3179 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3182 break;
3142 case 13: /* report window position */ 3183 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3189 break;
3149 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3193 break;
3153 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3196 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3199 break;
3159 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3160 { 3201 {
3161 char *s; 3202 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3205 XFree (s);
3165 } 3206 }
3166 break; 3207 break;
3167 case 21: /* report window title */ 3208 case 21: /* report window title */
3168 { 3209 {
3169 char *s; 3210 char *s;
3170 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3212 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3213 XFree (s);
3173 } 3214 }
3174 break; 3215 break;
3175 } 3216 }
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3272 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3273 */
3233void 3274void
3234rxvt_term::process_dcs_seq () 3275rxvt_term::process_dcs_seq ()
3235{ 3276{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3277 /*
3240 * Not handled yet 3278 * Not handled yet
3241 */ 3279 */
3280
3281 unicode_t eh;
3242 s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3243 if (s) 3283 if (s)
3244 free (s); 3284 free (s);
3245 3285
3246 return; 3286 return;
3247} 3287}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3291 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3292 */
3253void 3293void
3254rxvt_term::process_osc_seq () 3294rxvt_term::process_osc_seq ()
3255{ 3295{
3256 unicode_t ch, eh;
3257 int arg; 3296 int arg;
3258 3297
3259 ch = cmd_getc (); 3298 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3299 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3300 arg = arg * 10 + (ch - '0');
3262 3301
3263 if (ch == ';') 3302 if (ch == ';')
3264 { 3303 {
3304 unicode_t eh;
3265 char *s = get_to_st (eh); 3305 char *s = get_to_st (eh);
3266 3306
3267 if (s) 3307 if (s)
3268 { 3308 {
3269 process_xterm_seq (arg, s, eh); 3309 process_xterm_seq (arg, s, eh);
… …
3330 unsigned long bytes_after; 3370 unsigned long bytes_after;
3331 unsigned char *value = 0; 3371 unsigned char *value = 0;
3332 const char *str = ""; 3372 const char *str = "";
3333 3373
3334 if (prop 3374 if (prop
3335 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3336 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3337 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3338 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3339 && actual_type != None 3379 && actual_type != None
3340 && actual_format == 8) 3380 && actual_format == 8)
… …
3352 { 3392 {
3353 *eq = 0; 3393 *eq = 0;
3354 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3355 } 3395 }
3356 else 3396 else
3357 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3358 display->atom (str)); 3398 display->atom (str));
3359 } 3399 }
3360 break; 3400 break;
3361 3401
3362 case XTerm_Color: 3402 case XTerm_Color:
… …
3416 break; 3456 break;
3417#endif 3457#endif
3418 case URxvt_Color_border: 3458 case URxvt_Color_border:
3419 process_color_seq (op, Color_border, str, resp); 3459 process_color_seq (op, Color_border, str, resp);
3420 break; 3460 break;
3421#if ENABLE_TRANSPARENCY 3461
3462#if BG_IMAGE_FROM_ROOT
3422 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3423 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3424 { 3465 {
3425 bool changed = false; 3466 bool changed = false;
3426 3467
3427 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3428 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3429 else
3430 changed = bgPixmap.unset_tint ();
3431 3470
3432 if (changed) 3471 if (changed)
3433 update_background (); 3472 update_background ();
3434 } 3473 }
3435 3474
… …
3439#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3442 { 3481 {
3443 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3444 3487
3445 sprintf (str, "[%dx%d+%d+%d]", 3488 sprintf (str, "[%dx%d+%d+%d]",
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3489 h_scale, v_scale,
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3490 h_align, v_align);
3448 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 } 3492 }
3450 else 3493 else
3451 { 3494 {
3452 int changed = 0; 3495 bool changed = false;
3453 3496
3454 if (*str != ';') 3497 if (*str != ';')
3455 { 3498 {
3456 /* reset to default scaling :*/ 3499 try
3457 bgPixmap.unset_geometry (); 3500 {
3458 if (bgPixmap.set_file (str)) /* change pixmap */ 3501 fimage.set_file_geometry (this, str);
3459 changed++; 3502 changed = true;
3460 str = strchr (str, ';'); 3503 }
3461 if (str == NULL) 3504 catch (const class rxvt_failure_exception &e)
3462 bgPixmap.set_defaultGeometry (); 3505 {
3506 }
3463 } 3507 }
3464 3508 else
3465 while (str)
3466 { 3509 {
3467 str++; 3510 str++;
3468 if (bgPixmap.set_geometry (str)) 3511 if (fimage.set_geometry (str, true))
3469 changed++; 3512 changed = true;
3470 str = strchr (str, ';');
3471 } 3513 }
3472 3514
3473 if (changed) 3515 if (changed)
3516 {
3517 if (bg_window_position_sensitive ())
3518 {
3519 int x, y;
3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3474 update_background (); 3524 update_background ();
3525 }
3475 } 3526 }
3476 break; 3527 break;
3477#endif 3528#endif
3478 3529
3479 case XTerm_logfile: 3530 case XTerm_logfile:
… …
3566 * 's' = save 3617 * 's' = save
3567 * 'r' = restore 3618 * 'r' = restore
3568 * 't' = toggle 3619 * 't' = toggle
3569 * so no need for fancy checking 3620 * so no need for fancy checking
3570 */ 3621 */
3571int 3622int ecb_cold
3572rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3573{ 3624{
3574 int state; 3625 int state;
3575 3626
3576 if (mode == 's') 3627 if (mode == 's')
3577 { 3628 {
3578 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3579 return -1; 3633 return -1;
3580 } 3634 }
3581 else 3635 else
3582 { 3636 {
3583 if (mode == 'r') 3637 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3639 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 set_privmode (bit, state); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3588 } 3646 }
3589 3647
3590 return state; 3648 return state;
3591} 3649}
3592 3650
3593/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3594void 3652void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3654{
3597 unsigned int i, j; 3655 unsigned int i, j;
3598 int state; 3656 int state;
3599 3657
3600 static const struct 3658 static const struct
3601 { 3659 {
3602 const int argval; 3660 const int argval;
3603 const unsigned long bit; 3661 const unsigned long bit;
3604 } argtopriv[] = { 3662 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, // DECCKM 3663 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3607 { 3, PrivMode_132 }, // DECCOLM 3665 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, // DECSCLM 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, // DECSCNM 3667 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, // DECOM 3668 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3669 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3670 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3614 // 18 end FF to printer after print screen 3672 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3673 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3677#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK 3679 // 38, tektronix mode // DECTEK
3622 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3623 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3624 // 45 margin bell NYI 3682 // 45 margin bell NYI
3625 // 46 start logging 3683 // 46 start logging
3626 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3685 { 66, PrivMode_aplKP }, // DECNKM
3628#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3629 { 67, PrivMode_BackSpace }, // DECBKM 3687 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3688#endif
3631 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3691 { 1003, PrivMode_MouseAnyEvent },
3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste }, 3707 { 2004, PrivMode_BracketPaste },
3644 }; 3708 };
3645 3709
… …
3655 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3656 { 3720 {
3657 state = -1; 3721 state = -1;
3658 3722
3659 /* basic handling */ 3723 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3662 { 3726 {
3663 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3664 break; 3728 break;
3665 } 3729 }
… …
3691 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3758 * within VT52 mode
3695 */ 3759 */
3696 set_privmode (PrivMode_vt52, 1); 3760 priv_modes |= PrivMode_vt52;
3697 break; 3761 break;
3698 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701 break; 3765 break;
… …
3716 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3782 break;
3719#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3720 case scrollBar_esc: 3784 case scrollBar_esc:
3721 if (scrollBar.map (state)) 3785 scrollBar.map (state);
3722 {
3723 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3787 scr_touch (true);
3725 }
3726 break; 3788 break;
3727#endif 3789#endif
3728 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3729 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3730 break; 3792 break;
… …
3743 case 1003: 3805 case 1003:
3744 if (state) 3806 if (state)
3745 { 3807 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3748 vt_emask_mouse = PointerMotionMask; 3811 vt_emask_mouse = PointerMotionMask;
3749 } 3812 }
3750 else 3813 else
3751 vt_emask_mouse = NoEventMask; 3814 vt_emask_mouse = NoEventMask;
3752 3815
… …
3784 } 3847 }
3785} 3848}
3786/*}}} */ 3849/*}}} */
3787 3850
3788/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3789void 3852void ecb_hot
3790rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3791{ 3854{
3792 unsigned int i; 3855 unsigned int i;
3793 short rendset; 3856 short rendset;
3794 int rendstyle; 3857 int rendstyle;
… …
3935 break; 3998 break;
3936#endif 3999#endif
3937 } 4000 }
3938 } 4001 }
3939} 4002}
3940/*}}} */
3941 4003
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void 4004void
3944rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
3945{ 4006{
3946 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
3947
3948 if (cmd == 'Q')
3949 {
3950 /* query graphics */
3951 tt_printf ("\033G0\012"); /* no graphics */
3952 return; 4008 return;
3953 } 4009
3954 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
3955 do 4011
3956 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
3957 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
3958} 4018}
3959/*}}} */ 4019/*}}} */
3960 4020
3961/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3962 4022
… …
3978 4038
3979/* ---------------------------------------------------------------------- */ 4039/* ---------------------------------------------------------------------- */
3980/* Write data to the pty as typed by the user, pasted with the mouse, 4040/* Write data to the pty as typed by the user, pasted with the mouse,
3981 * or generated by us in response to a query ESC sequence. 4041 * or generated by us in response to a query ESC sequence.
3982 */ 4042 */
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3984 4044
3985void 4045void
3986rxvt_term::tt_write (const char *data, unsigned int len) 4046rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 4047{
3988 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3993 4053
3994 if (v_buflen == 0) 4054 if (v_buflen == 0)
3995 { 4055 {
3996 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4056 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3997 4057
4058 max_it (written, 0);
4059
3998 if ((unsigned int)written == len) 4060 if (written == len)
3999 return; 4061 return;
4000 4062
4001 data += written; 4063 data += written;
4002 len -= written; 4064 len -= written;
4003 } 4065 }
4004 4066
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4067 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4068
4007 memcpy (v_buffer + v_buflen, data, len); 4069 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4070 v_buflen += len;
4009 4071
4010 pty_ev.set (ev::READ | ev::WRITE); 4072 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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