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.477 by root, Mon Feb 21 07:41:00 2011 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 <schmorp@schmorp.de> 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
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 (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 950 scr_touch (false);
984 } 951 }
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 ();
1337 32 + x, 1352 32 + x,
1338 32 + y); 1353 32 + y);
1339} 1354}
1340 1355
1341/*{{{ process an X event */ 1356/*{{{ process an X event */
1342void 1357void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1344{ 1359{
1345 make_current (); 1360 make_current ();
1346 1361
1347 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
1445 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1461 focus_out ();
1447 break; 1462 break;
1448 1463
1449 case ConfigureNotify: 1464 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1451 { 1466 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1468 ;
1454 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1458 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1459 int x, y; 1484 int x, y;
1485
1460 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1461 { 1487 {
1462 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1464 } 1490 }
1465 else 1491 else
1466 get_window_origin (x, y); 1492 get_window_origin (x, y);
1467 1493
1468 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1499 moved = true;
1500 }
1471 } 1501 }
1472#endif
1473 1502
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1504 {
1476 seen_resize = 1; 1505 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1507 }
1479 else 1508 else
1480 { 1509 {
1481#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1511 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1512 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1513#endif
1490 } 1514 }
1491 1515
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1517 }
1505 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1506 break; 1530 break;
1507 1531
1508 case MapNotify: 1532 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1511 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1513 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1514 * reparenting. 1538 // events at startup when the window manager reparents the
1515 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1517 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1524#endif 1543#endif
1525 mapped = 1; 1544 mapped = 1;
1526#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1527 text_blink_ev.start (); 1546 text_blink_ev.start ();
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1587 ;
1569 1588
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1590 {
1572 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1592 scrollBar.show (0);
1574 } 1593 }
1575 } 1594 }
1576 break; 1595 break;
1577 1596
1643 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1644 } 1663 }
1645 else 1664 else
1646 { 1665 {
1647 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1668 }
1650 1669
1651 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1672 + 1;
1665#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1666 } 1685 }
1667#endif 1686#endif
1668 } 1687 }
1669 } 1688 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1690 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1674 ; 1693 ;
1675 1694
1676 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1699 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1701 scrollBar.size ());
1683 want_refresh = 1; 1702 want_refresh = 1;
1684 scrollBar.show (1); 1703 scrollBar.show (1);
1685 } 1704 }
1686 break; 1705 break;
1687 } 1706 }
1688 1707
1689#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1699 }
1700#endif 1711#endif
1701 1712
1702#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1715 {
1715 1726
1716 refresh_check (); 1727 refresh_check ();
1717} 1728}
1718 1729
1719#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1720void 1731void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1722{ 1733{
1723 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1724 return; 1735 return;
1725 1736
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1738 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1740 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1731 } 1743 }
1732} 1744}
1733#endif 1745#endif
1734 1746
1735void 1747void ecb_cold
1736rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1737{ 1749{
1738 if (!focus) 1750 if (!focus)
1739 { 1751 {
1740 focus = 1; 1752 focus = 1;
1741 want_refresh = 1; 1753 want_refresh = 1;
1742 1754
1743#if USE_XIM 1755#if USE_XIM
1744 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1745 { 1757 {
1746 IMSetPosition (); 1758 im_set_position ();
1747 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1748 } 1760 }
1749#endif 1761#endif
1750#if CURSOR_BLINK 1762#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
1765 1777
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1779 }
1768} 1780}
1769 1781
1770void 1782void ecb_cold
1771rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1772{ 1784{
1773 if (focus) 1785 if (focus)
1774 { 1786 {
1775 focus = 0; 1787 focus = 0;
1808 1820
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1822 }
1811} 1823}
1812 1824
1813void 1825void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1815{ 1827{
1816#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1818 { 1830 {
1821 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);
1822 } 1834 }
1823#endif 1835#endif
1824} 1836}
1825 1837
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1827void 1839void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1841{
1830 make_current (); 1842 make_current ();
1831 1843
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1846 return;
1835 1847
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1848 switch (ev.type)
1838 { 1849 {
1839 case PropertyNotify: 1850 case PropertyNotify:
1840 /* 1851 /*
1841 * 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,
1842 * 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.
1843 */ 1854 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1857 {
1847 bg_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);
1848 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1849 } 1866 }
1850 1867
1851 break; 1868 break;
1852 } 1869 }
1853# endif
1854 1870
1855 refresh_check (); 1871 refresh_check ();
1856} 1872}
1857#endif 1873#endif
1858 1874
1982 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 1999 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 2001 direction = DN; /* down */
1986 2002
1987 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1988 /* 2004 /*
1989 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 2006 * move up if mouse is above slider
1991 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1992 * 2008 *
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2048#endif
2033 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2034 { 2050 {
2035 if (direction == UP) 2051 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2037 else 2053 else
2038 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2039 } 2055 }
2040 } 2056 }
2041 else 2057 else
2042 switch (ev.button) 2058 switch (ev.button)
2043 { 2059 {
2044 case Button2: 2060 case Button2:
2045 switch (scrollBar.align) 2061 switch (scrollBar.align)
2046 { 2062 {
2047 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2048 csrO = 0; 2064 csrO = 0;
2049 break; 2065 break;
2050 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2068 break;
2053 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2071 break;
2056 } 2072 }
2057 2073
2058 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2078
2063 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2064 break; 2080 break;
2065 2081
2066 case Button1: 2082 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2070 2086
2071 case Button3: 2087 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2089 {
2074 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2077# else 2093# else
2078 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2079# endif 2095# endif
2080 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2083# else 2099# else
2084 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2085# endif 2101# endif
2086 else 2102 else
2087 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2088 } 2104 }
2089 else 2105 else
2090 { 2106 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2108 (nrow
2093 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2110 / scrollBar.size ()));
2095 } 2111 }
2096 2112
2097 break; 2113 break;
2098 } 2114 }
2109 2125
2110 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2127 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2129
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2131 {
2116 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2133 scrollBar.show (0);
2118 } 2134 }
2119 2135
2120#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2171 case Button3: 2187 case Button3:
2172 selection_make (ev.time); 2188 selection_make (ev.time);
2173 break; 2189 break;
2174 2190
2175 case Button2: 2191 case Button2:
2176 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?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2194 break;
2179 2195
2180#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2181 case Button4: 2197 case Button4:
2182 case Button5: 2198 case Button5:
2183 { 2199 {
2184 int i; 2200 int lines;
2185 page_dirn v; 2201 page_dirn dirn;
2186 2202
2187 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2188 2204
2189 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2190 i = 1; 2206 lines = 1;
2191 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2192 i = nrow - 1; 2208 lines = nrow - 1;
2193 else 2209 else
2194 i = 5; 2210 lines = 5;
2195 2211
2196# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2197 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2198 { 2214 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2218
2203 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205 } 2221 }
2206 else 2222 else
2207# endif 2223# endif
2208 { 2224 {
2209 scr_page (v, i); 2225 scr_page (dirn, lines);
2210 scrollBar.show (1); 2226 scrollBar.show (1);
2211 } 2227 }
2212 } 2228 }
2213 break; 2229 break;
2214#endif 2230#endif
2216 } 2232 }
2217} 2233}
2218 2234
2219/*}}} */ 2235/*}}} */
2220 2236
2221void 2237void ecb_hot
2222rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2223{ 2239{
2224 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2226 2242
2227 for (;;) 2243 for (;;)
2228 { 2244 {
2229 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2230 { 2246 {
2231 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2248 ch = next_char ();
2233 2249
2234 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2235 break; 2251 break;
2236 } 2252 }
2237 2253
2238 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))
2239 { 2255 {
2240 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2241 { 2257 {
2242 seen_input = 1; 2258 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
2258 wchar_t *str = buf; 2274 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2276
2261 for (;;) 2277 for (;;)
2262 { 2278 {
2263 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)))
2264 break; 2280 break;
2265 2281
2266 *str++ = ch; 2282 *str++ = ch;
2267 2283
2268 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2285 {
2270 if (ch == C0_LF) 2286 if (ch == C0_LF)
2271 nlines++; 2287 nlines++;
2272 2288
2273 refresh_count++; 2289 refresh_count++;
2345 } 2361 }
2346 } 2362 }
2347} 2363}
2348 2364
2349// read the next character 2365// read the next character
2350wchar_t 2366wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2352{ 2368{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2370 {
2355 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2358 2374
2359 wchar_t wc; 2375 wchar_t wc;
2360 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);
2361 2377
2367 } 2383 }
2368 2384
2369 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2370 { 2386 {
2371 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.
2372 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
2373 } 2391 }
2374 2392
2375 // assume wchar == unicode 2393 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2379 2397
2380 return NOCHAR; 2398 return NOCHAR;
2381} 2399}
2382 2400
2383// read the next octet 2401// read the next octet
2384uint32_t 2402uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2386{ 2404{
2387 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2407 : NOCHAR;
2390} 2408}
2391 2409
2392static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2393 2411
2394/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2414{
2402 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2403 2416
2404 if (c == NOCHAR) 2417 if (c == NOCHAR)
2405 throw out_of_input; 2418 throw out_of_input;
2406 2419
2407 return c; 2420 return c;
2408} 2421}
2409 2422
2410uint32_t 2423uint32_t ecb_hot
2411rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412{ 2425{
2413 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2414 2427
2415 if (c == NOCHAR) 2428 if (c == NOCHAR)
2419} 2432}
2420 2433
2421/*{{{ print pipe */ 2434/*{{{ print pipe */
2422/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2423#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2424FILE * 2437FILE * ecb_cold
2425rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2426{ 2439{
2427 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");
2428 2441
2429 if (stream == NULL) 2442 if (stream == NULL)
2430 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2431 2444
2432 return stream; 2445 return stream;
2433} 2446}
2434 2447
2435int 2448int ecb_cold
2436rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2437{ 2450{
2438 fflush (stream); 2451 fflush (stream);
2439 return pclose (stream); 2452 return pclose (stream);
2440} 2453}
2441 2454
2442/* 2455/*
2443 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2444 */ 2457 */
2445void 2458void ecb_cold
2446rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2447{ 2460{
2448 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2449 2462
2450 if (!fd) 2463 if (!fd)
2496 pclose_printer (fd); 2509 pclose_printer (fd);
2497} 2510}
2498#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2499/*}}} */ 2512/*}}} */
2500 2513
2501/* *INDENT-OFF* */
2502enum { 2514enum {
2503 C1_40 = 0x40, 2515 C1_40 = 0x40,
2504 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,
2505 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,
2506 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,
2507 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,
2508}; 2520};
2509/* *INDENT-ON* */
2510 2521
2511/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2512void 2523void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2525{
2515 switch (ch) 2526 switch (ch)
2516 { 2527 {
2517 case C0_ESC: 2528 case C0_ESC:
2563} 2574}
2564/*}}} */ 2575/*}}} */
2565 2576
2566 2577
2567/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2568void 2579void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2581{
2571 int row, col; 2582 int row, col;
2572 2583
2573 switch (ch) 2584 switch (ch)
2607 break; 2618 break;
2608 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2621 break;
2611 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2623 priv_modes &= ~PrivMode_vt52;
2613 break; 2624 break;
2614 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2616 /* unimplemented */ 2627 /* unimplemented */
2617 break; 2628 break;
2623} 2634}
2624/*}}} */ 2635/*}}} */
2625 2636
2626 2637
2627/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2628void 2639void ecb_hot
2629rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2630{ 2641{
2631 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2632 2643
2633 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
2636 return; 2647 return;
2637 } 2648 }
2638 2649
2639 switch (ch) 2650 switch (ch)
2640 { 2651 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2652 case '#':
2643 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2644 scr_E (); 2654 scr_E ();
2645 break; 2655 break;
2646 case '(': 2656 case '(':
2669#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2670 case '9': 2680 case '9':
2671 scr_forwardindex (); 2681 scr_forwardindex ();
2672 break; 2682 break;
2673#endif 2683#endif
2684 // DECPAM/DECPNM
2674 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2675 case '>': 2688 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2689 priv_modes &= ~PrivMode_aplKP;
2677 break; 2690 break;
2678 2691
2679 case C1_40: 2692 case C1_40:
2680 cmd_getc (); 2693 cmd_getc ();
2681 break; 2694 break;
2685 2698
2686 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2688 { 2701 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2704 }
2692 break; 2705 break;
2693 2706
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
2696 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 */
2697 break; 2712 break;
2698 2713
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2716 scr_set_tab (1);
2705 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2706 scr_index (DN); 2721 scr_index (DN);
2707 break; 2722 break;
2708 2723
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2711 2726
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2714 2729
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2732 process_dcs_seq ();
2718 break; 2733 break;
2751 } 2766 }
2752} 2767}
2753/*}}} */ 2768/*}}} */
2754 2769
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2771enum {
2758 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
2759 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,
2760 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 ,
2761 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,
2781 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, */
2782 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, */
2783 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, */
2784 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, {, |, }, ~, */
2785 }; 2799 };
2786/* *INDENT-ON* */
2787 2800
2788void 2801void ecb_hot
2789rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2790{ 2803{
2791 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2792 unsigned int nargs, p; 2805 unsigned int nargs, p;
2793 int n, ndef; 2806 int n, ndef;
2794 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2795 2808
2796 nargs = 0; 2809 nargs = 0;
2802 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2803 priv = ch; 2816 priv = ch;
2804 ch = cmd_getc (); 2817 ch = cmd_getc ();
2805 } 2818 }
2806 2819
2820 prev_ch = 0;
2807 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2808 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2809 { 2823 {
2810 if (isdigit (ch)) 2824 if (isdigit (ch))
2811 { 2825 {
2821 n = -1; 2835 n = -1;
2822 } 2836 }
2823 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2824 process_nonprinting (ch); 2838 process_nonprinting (ch);
2825 2839
2840 prev_ch = ch;
2826 ch = cmd_getc (); 2841 ch = cmd_getc ();
2827 } 2842 }
2828 2843
2829 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2830 return; 2845 return;
2871 scr_soft_reset (); 2886 scr_soft_reset ();
2872 2887
2873 static const int pm_h[] = { 7, 25 }; 2888 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875 2890
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878 } 2893 }
2879 break; 2894 break;
2880 } 2895 }
2881 2896
2882 return; 2897 return;
2900 } 2915 }
2901 break; 2916 break;
2902#endif 2917#endif
2903 2918
2904 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2905 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2906 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2907 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2908 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2909 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2910 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2911 break; 2926 break;
2912 2927
2913 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2914 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3064 scr_insert_mode (1); 3079 scr_insert_mode (1);
3065 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3066 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3067 break; 3082 break;
3068 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3069 /* 3089 /*
3070 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3071 */ 3091 */
3072 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3073 if (nargs == 1) 3093 if (nargs == 1)
3101 } 3121 }
3102} 3122}
3103/*}}} */ 3123/*}}} */
3104 3124
3105#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3106/* ARGSUSED */
3107void 3126void
3108rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109{ 3128{
3110 int x, y; 3129 int x, y;
3111 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
3120 { 3139 {
3121 /* 3140 /*
3122 * commands 3141 * commands
3123 */ 3142 */
3124 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3125 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3126 break; 3145 break;
3127 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3128 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3129 break; 3148 break;
3130 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3131 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3132 break; 3151 break;
3133 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135 break; 3154 break;
3136 case 5: /* raise window */ 3155 case 5: /* raise window */
3137 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3138 break; 3157 break;
3139 case 6: /* lower window */ 3158 case 6: /* lower window */
3140 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3141 break; 3160 break;
3142 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3143 scr_touch (true); 3162 scr_touch (true);
3144 break; 3163 break;
3145 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
3148 break; 3167 break;
3149 3168
3150 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3151 default: 3170 default:
3152 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3153 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3154 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3155 break; 3174 break;
3156 3175
3157 /* 3176 /*
3158 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3159 */ 3178 */
3160 case 11: /* report window state */ 3179 case 11: /* report window state */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163 break; 3182 break;
3164 case 13: /* report window position */ 3183 case 13: /* report window position */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3166 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3167 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3168 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3169 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3170 break; 3189 break;
3171 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174 break; 3193 break;
3175 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3176 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177 break; 3196 break;
3179 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180 break; 3199 break;
3181 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3182 { 3201 {
3183 char *s; 3202 char *s;
3184 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3185 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 */
3186 XFree (s); 3205 XFree (s);
3187 } 3206 }
3188 break; 3207 break;
3189 case 21: /* report window title */ 3208 case 21: /* report window title */
3190 { 3209 {
3191 char *s; 3210 char *s;
3192 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3193 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 */
3194 XFree (s); 3213 XFree (s);
3195 } 3214 }
3196 break; 3215 break;
3197 } 3216 }
3351 unsigned long bytes_after; 3370 unsigned long bytes_after;
3352 unsigned char *value = 0; 3371 unsigned char *value = 0;
3353 const char *str = ""; 3372 const char *str = "";
3354 3373
3355 if (prop 3374 if (prop
3356 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3357 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3358 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3359 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3360 && actual_type != None 3379 && actual_type != None
3361 && actual_format == 8) 3380 && actual_format == 8)
3373 { 3392 {
3374 *eq = 0; 3393 *eq = 0;
3375 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3376 } 3395 }
3377 else 3396 else
3378 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3379 display->atom (str)); 3398 display->atom (str));
3380 } 3399 }
3381 break; 3400 break;
3382 3401
3383 case XTerm_Color: 3402 case XTerm_Color:
3437 break; 3456 break;
3438#endif 3457#endif
3439 case URxvt_Color_border: 3458 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp); 3459 process_color_seq (op, Color_border, str, resp);
3441 break; 3460 break;
3442#if ENABLE_TRANSPARENCY 3461
3462#if BG_IMAGE_FROM_ROOT
3443 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3444 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3445 { 3465 {
3446 bool changed = false; 3466 bool changed = false;
3447 3467
3448 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3450 3470
3451 if (changed) 3471 if (changed)
3452 update_background (); 3472 update_background ();
3453 } 3473 }
3454 3474
3458#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3459 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3460 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3461 { 3481 {
3462 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;
3463 3487
3464 sprintf (str, "[%dx%d+%d+%d]", 3488 sprintf (str, "[%dx%d+%d+%d]",
3465 min (h_scale, 32767), min (v_scale, 32767), 3489 h_scale, v_scale,
3466 min (h_align, 32767), min (v_align, 32767)); 3490 h_align, v_align);
3467 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3468 } 3492 }
3469 else 3493 else
3470 { 3494 {
3471 int changed = 0; 3495 bool changed = false;
3472 3496
3473 if (*str != ';') 3497 if (*str != ';')
3474 { 3498 {
3475 if (bg_set_file (str)) /* change pixmap */ 3499 try
3476 { 3500 {
3501 fimage.set_file_geometry (this, str);
3477 changed++; 3502 changed = true;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else 3503 }
3482 bg_set_geometry (str+1); 3504 catch (const class rxvt_failure_exception &e)
3505 {
3483 } 3506 }
3484 } 3507 }
3485 else 3508 else
3486 { 3509 {
3487 str++; 3510 str++;
3488 if (bg_set_geometry (str, true)) 3511 if (fimage.set_geometry (str, true))
3489 changed++; 3512 changed = true;
3490 } 3513 }
3491 3514
3492 if (changed) 3515 if (changed)
3493 { 3516 {
3494 if (bg_window_position_sensitive ()) 3517 if (bg_window_position_sensitive ())
3495 { 3518 {
3496 int x, y; 3519 int x, y;
3497 get_window_origin (x, y); 3520 get_window_origin (x, y);
3498 bg_set_position (x, y); 3521 parent_x = x;
3522 parent_y = y;
3499 } 3523 }
3500 update_background (); 3524 update_background ();
3501 } 3525 }
3502 } 3526 }
3503 break; 3527 break;
3593 * 's' = save 3617 * 's' = save
3594 * 'r' = restore 3618 * 'r' = restore
3595 * 't' = toggle 3619 * 't' = toggle
3596 * so no need for fancy checking 3620 * so no need for fancy checking
3597 */ 3621 */
3598int 3622int ecb_cold
3599rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3600{ 3624{
3601 int state; 3625 int state;
3602 3626
3603 if (mode == 's') 3627 if (mode == 's')
3604 { 3628 {
3605 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3606 return -1; 3633 return -1;
3607 } 3634 }
3608 else 3635 else
3609 { 3636 {
3610 if (mode == 'r') 3637 if (mode == 'r')
3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3612 else 3639 else
3613 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614 3641
3615 set_privmode (bit, state); 3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3616 } 3646 }
3617 3647
3618 return state; 3648 return state;
3619} 3649}
3620 3650
3621/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3622void 3652void
3623rxvt_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)
3624{ 3654{
3625 unsigned int i, j; 3655 unsigned int i, j;
3626 int state; 3656 int state;
3627 3657
3628 static const struct 3658 static const struct
3629 { 3659 {
3630 const int argval; 3660 const int argval;
3631 const unsigned long bit; 3661 const unsigned long bit;
3632 } argtopriv[] = { 3662 } argtopriv[] = {
3633 { 1, PrivMode_aplCUR }, // DECCKM 3663 { 1, PrivMode_aplCUR }, // DECCKM
3634 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3635 { 3, PrivMode_132 }, // DECCOLM 3665 { 3, PrivMode_132 }, // DECCOLM
3636 { 4, PrivMode_smoothScroll }, // DECSCLM 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3637 { 5, PrivMode_rVideo }, // DECSCNM 3667 { 5, PrivMode_rVideo }, // DECSCNM
3638 { 6, PrivMode_relOrigin }, // DECOM 3668 { 6, PrivMode_relOrigin }, // DECOM
3639 { 7, PrivMode_Autowrap }, // DECAWM 3669 { 7, PrivMode_Autowrap }, // DECAWM
3640 // 8, auto-repeat keys // DECARM 3670 // 8, auto-repeat keys // DECARM
3641 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3642 // 18 end FF to printer after print screen 3672 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region 3673 // 19 Print screen prints full screen/scroll region
3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3646 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3647#endif 3677#endif
3648 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK 3679 // 38, tektronix mode // DECTEK
3650 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3651 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3652 // 45 margin bell NYI 3682 // 45 margin bell NYI
3653 // 46 start logging 3683 // 46 start logging
3654 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3685 { 66, PrivMode_aplKP }, // DECNKM
3656#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3657 { 67, PrivMode_BackSpace }, // DECBKM 3687 { 67, PrivMode_BackSpace }, // DECBKM
3658#endif 3688#endif
3659 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3660 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
3689 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3690 { 3720 {
3691 state = -1; 3721 state = -1;
3692 3722
3693 /* basic handling */ 3723 /* basic handling */
3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3695 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3696 { 3726 {
3697 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3698 break; 3728 break;
3699 } 3729 }
3725 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3726 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3727 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3728 * within VT52 mode 3758 * within VT52 mode
3729 */ 3759 */
3730 set_privmode (PrivMode_vt52, 1); 3760 priv_modes |= PrivMode_vt52;
3731 break; 3761 break;
3732 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3733 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3735 break; 3765 break;
3750 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3752 break; 3782 break;
3753#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3754 case scrollBar_esc: 3784 case scrollBar_esc:
3755 if (scrollBar.map (state)) 3785 scrollBar.map (state);
3756 {
3757 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3758 scr_touch (true); 3787 scr_touch (true);
3759 }
3760 break; 3788 break;
3761#endif 3789#endif
3762 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3763 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3764 break; 3792 break;
3819 } 3847 }
3820} 3848}
3821/*}}} */ 3849/*}}} */
3822 3850
3823/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3824void 3852void ecb_hot
3825rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3826{ 3854{
3827 unsigned int i; 3855 unsigned int i;
3828 short rendset; 3856 short rendset;
3829 int rendstyle; 3857 int rendstyle;
3970 break; 3998 break;
3971#endif 3999#endif
3972 } 4000 }
3973 } 4001 }
3974} 4002}
3975/*}}} */
3976 4003
3977/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3978void 4004void
3979rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
3980{ 4006{
3981 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
3982
3983 if (cmd == 'Q')
3984 {
3985 /* query graphics */
3986 tt_printf ("\033G0\012"); /* no graphics */
3987 return; 4008 return;
3988 } 4009
3989 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
3990 do 4011
3991 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
3992 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
3993} 4018}
3994/*}}} */ 4019/*}}} */
3995 4020
3996/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3997 4022
4028 4053
4029 if (v_buflen == 0) 4054 if (v_buflen == 0)
4030 { 4055 {
4031 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));
4032 4057
4058 max_it (written, 0);
4059
4033 if ((unsigned int)written == len) 4060 if (written == len)
4034 return; 4061 return;
4035 4062
4036 data += written; 4063 data += written;
4037 len -= written; 4064 len -= written;
4038 } 4065 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines