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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 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-2014 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 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 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",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 400 break;
394 } 401 }
395 return param; 402 return param;
396} 403}
397 404
398void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
400{ 416{
401 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
402 KeySym keysym; 418 KeySym keysym;
403 int valid_keysym; 419 int valid_keysym;
404 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
405 422
406#if ISO_14755 423#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
408 return; 425 return;
409#endif 426#endif
… …
416 */ 433 */
417 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
420 437
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
505#ifdef PAGING_CONTEXT_LINES 516#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 517 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 518#else
508 lnsppg = nrow * 4 / 5; 519 lnsppg = nrow * 4 / 5;
509#endif 520#endif
521 max_it (lnsppg, 1);
522
510 if (keysym == XK_Prior) 523 if (keysym == XK_Prior)
511 { 524 {
512 scr_page (UP, lnsppg); 525 scr_page (lnsppg);
513 return; 526 return;
514 } 527 }
515 else if (keysym == XK_Next) 528 else if (keysym == XK_Next)
516 { 529 {
517 scr_page (DN, lnsppg); 530 scr_page (-lnsppg);
518 return; 531 return;
519 } 532 }
520 } 533 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 534#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 535 if (IS_SCROLL_MOD)
523 { 536 {
524 if (keysym == XK_Up) 537 if (keysym == XK_Up)
525 { 538 {
526 scr_page (UP, 1); 539 scr_page (1);
527 return; 540 return;
528 } 541 }
529 else if (keysym == XK_Down) 542 else if (keysym == XK_Down)
530 { 543 {
531 scr_page (DN, 1); 544 scr_page (-1);
532 return; 545 return;
533 } 546 }
534 } 547 }
535#endif 548#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 549#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 550 if (IS_SCROLL_MOD)
538 { 551 {
539 if (keysym == XK_Home) 552 if (keysym == XK_Home)
540 { 553 {
541 scr_move_to (0, 1); 554 scr_changeview (top_row);
542 return; 555 return;
543 } 556 }
544 else if (keysym == XK_End) 557 else if (keysym == XK_End)
545 { 558 {
546 scr_move_to (1, 1); 559 scr_changeview (0);
547 return; 560 return;
548 } 561 }
549 } 562 }
550#endif 563#endif
551 } 564 }
… …
567 selection_request (ev.time); 580 selection_request (ev.time);
568 return; 581 return;
569#if TODO 582#if TODO
570 /* rxvt extras */ 583 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 584 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 585 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 586 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 587 return;
577#endif 588#endif
578 } 589 }
579 } 590 }
580 } 591 }
581 592
593 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
594 {
595 if (keysym == XK_v)
596 selection_request (ev.time, Sel_Clipboard);
597 else if (selection.len > 0)
598 {
599 free (selection.clip_text);
600 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
601 selection.clip_len = selection.len;
602 selection_grab (CurrentTime, true);
603 }
604
605 return;
606 }
607
582#if ENABLE_FRILLS || ISO_14755 608#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 609 // ISO 14755 support
584 if (shft && ctrl) 610 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 611 {
586 int hv; 612 int hv;
587 613
588 if (iso14755buf & ISO_14755_51 614 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 615 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 645 scr_overlay_off ();
620# endif 646# endif
621 iso14755buf = 0; 647 iso14755buf = 0;
622 } 648 }
623 } 649 }
650 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 651 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 652 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 653 if (!(iso14755buf & ISO_14755_STARTED))
627 { 654 {
628 iso14755buf |= ISO_14755_STARTED; 655 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 656# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 657 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 671 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 672 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 673 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 674 unsigned int newlen = 1;
648 675
676 if (ev.state & ModNumLockMask)
677 kp = false;
678
649 switch (translate_keypad (keysym, kp)) 679 keysym = translate_keypad (keysym, kp);
680
681 switch (keysym)
650 { 682 {
651#ifndef NO_BACKSPACE_KEY 683#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 684 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 685 if (priv_modes & PrivMode_HaveBackSpace)
654 { 686 {
… …
773 } 805 }
774 806
775 if (newlen) 807 if (newlen)
776 len = strlen (kbuf); 808 len = strlen (kbuf);
777 809
810 if (len > 0)
811 {
778 /* 812 /*
813 * pass Shift/Control indicators for function keys ending with `~'
814 *
815 * eg,
816 * Prior = "ESC[5~"
817 * Shift+Prior = "ESC[5$"
818 * Ctrl+Prior = "ESC[5^"
819 * Ctrl+Shift+Prior = "ESC[5@"
820 */
821 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
822 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
823
824 /*
779 * Pass meta for all function keys, if 'meta' option set 825 * Pass meta for all function keys, if 'meta' option set
780 */ 826 */
781#ifdef META8_OPTION 827#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 828 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 829 kbuf[len - 1] |= 0x80;
784#endif 830#endif
831 }
785 832
786 } 833 }
787 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
788 { 835 {
789 len = 1; 836 len = 1;
… …
808 meta = 0; 855 meta = 0;
809 } 856 }
810#endif 857#endif
811 /* nil */ ; 858 /* nil */ ;
812 } 859 }
860 }
861
862 /* escape prefix */
863 if (len && meta
864#ifdef META8_OPTION
865 && meta_char == C0_ESC
866#endif
867 )
868 {
869 *--kbuf = C0_ESC;
870 len++;
813 } 871 }
814 872
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return; 874 return;
817 875
… …
823 { 881 {
824 view_start = 0; 882 view_start = 0;
825 want_refresh = 1; 883 want_refresh = 1;
826 } 884 }
827 885
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 886 tt_write (kbuf, (unsigned int)len);
854} 887}
855 888
856void 889void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 890rxvt_term::key_release (XKeyEvent &ev)
858{ 891{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 892#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 893 KeySym keysym;
861 894
… …
881 commit_iso14755 (); 914 commit_iso14755 ();
882 915
883 return; 916 return;
884 } 917 }
885 918
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 919 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 920 if (i[0] == keysym)
888 { 921 {
889 iso14755buf = ISO_14755_51 | i[1]; 922 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 923 commit_iso14755 ();
891 924
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 961 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 962 mouse_slip_wheel_speed = 0;
930#endif 963#endif
931} 964}
932 965
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 966void
967rxvt_term::flush () 967rxvt_term::flush ()
968{ 968{
969 flush_ev.stop (); 969 flush_ev.stop ();
970 970
971#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 972 if (bg_flags & BG_NEEDS_REFRESH)
973 { 973 {
974// scr_clear (true); This needs to be researched further! 974 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 975 scr_touch (false);
976 } 976 }
977#endif 977#endif
978 978
979 if (want_refresh) 979 if (want_refresh)
… …
1016 while (row < end_row); 1016 while (row < end_row);
1017 } 1017 }
1018 1018
1019 scr_refresh (); 1019 scr_refresh ();
1020 scrollBar.show (1); 1020 scrollBar.show (1);
1021#ifdef USE_XIM 1021#if USE_XIM
1022 IMSendSpot (); 1022 im_send_spot ();
1023#endif 1023#endif
1024 } 1024 }
1025 1025
1026 display->flush (); 1026 display->flush ();
1027} 1027}
1028 1028
1029/* checks wether a refresh is requested and starts the refresh timer */ 1029/* checks whether a refresh is requested and starts the refresh timer */
1030void 1030void
1031rxvt_term::refresh_check () 1031rxvt_term::refresh_check ()
1032{ 1032{
1033 if (want_refresh && !flush_ev.is_active ()) 1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1044 refresh_count = 0;
1045 flush (); 1045 flush ();
1046} 1046}
1047 1047
1048#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1049void
1050rxvt_term::cursor_blink_reset ()
1051{
1052 if (hidden_cursor)
1053 {
1054 hidden_cursor = 0;
1055 want_refresh = 1;
1056 }
1057
1058 if (option (Opt_cursorBlink))
1059 cursor_blink_ev.again ();
1060 else
1061 cursor_blink_ev.stop ();
1062}
1063
1049void 1064void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1066{
1052 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1068 want_refresh = 1;
… …
1072 1087
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1089void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1091{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1092 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1094 {
1080 want_refresh = 1; 1095 want_refresh = 1;
1081 refresh_check (); 1096 refresh_check ();
1082 } 1097 }
1083 else 1098 else
… …
1087 1102
1088#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1089void 1104void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1106{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_lines))
1093 { 1108 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1110 want_refresh = 1;
1096 refresh_check (); 1111 refresh_check ();
1097 } 1112 }
… …
1102 1117
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1119void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1121{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1122 if (scr_page (mouse_slip_wheel_speed))
1108 { 1123 {
1109 want_refresh = 1; 1124 want_refresh = 1;
1110 refresh_check (); 1125 refresh_check ();
1111 } 1126 }
1112 1127
… …
1127 { 1142 {
1128 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1144 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1145 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
1147 // since the linux guys additionally thought that breaking the only
1148 // known workaround against their unusable sched_yield hack is cool,
1149 // we just nanosleep a bit and hope for the best.
1132 1150
1133 struct timespec ts = { 0, 0 }; 1151 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1152 nanosleep (&ts, 0);
1135 1153
1136 w.stop (); 1154 w.stop ();
1137 } 1155 }
1138 1156
… …
1141 { 1159 {
1142 } 1160 }
1143} event_handler; 1161} event_handler;
1144#endif 1162#endif
1145 1163
1164/* make sure all the cmd data is at beginning of cmdbuf */
1165void
1166rxvt_term::cmdbuf_reify ()
1167{
1168 if (cmdbuf_ptr == cmdbuf_base)
1169 return;
1170
1171 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1172
1173 memmove (cmdbuf_base, cmdbuf_ptr, used);
1174 cmdbuf_ptr = cmdbuf_base;
1175 cmdbuf_endp = cmdbuf_ptr + used;
1176
1177}
1178
1179#if defined (KEYSYM_RESOURCE)
1180void
1181rxvt_term::cmdbuf_append (const char *str, size_t count)
1182{
1183 cmdbuf_reify ();
1184
1185 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1186
1187 if (count > avail)
1188 return;
1189
1190 memcpy (cmdbuf_endp, str, count);
1191 cmdbuf_endp += count;
1192
1193 cmd_parse ();
1194}
1195#endif
1196
1146bool 1197bool
1147rxvt_term::pty_fill () 1198rxvt_term::pty_fill ()
1148{ 1199{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1200 cmdbuf_reify ();
1150 1201
1151 if (CBUFSIZ == n) 1202 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1203
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1204 if (!avail)
1154 n = 0;
1155 } 1205 {
1156 1206 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1207 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1208 cmdbuf_endp = cmdbuf_ptr;
1209 avail = CBUFSIZ;
1210 }
1160 1211
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1212 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1213
1163 if (r > 0) 1214 if (r > 0)
1164 { 1215 {
1165 cmdbuf_endp += r; 1216 cmdbuf_endp += r;
1166 return true; 1217 return true;
… …
1188{ 1239{
1189 make_current (); 1240 make_current ();
1190 1241
1191 if (revents & ev::READ) 1242 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1243 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1244 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1245 cmd_parse ();
1195 break;
1196 1246
1197 if (revents & ev::WRITE) 1247 if (revents & ev::WRITE)
1198 pty_write (); 1248 pty_write ();
1199 1249
1200 refresh_check (); 1250 refresh_check ();
1201} 1251}
1202 1252
1203void 1253void ecb_cold
1204rxvt_term::pointer_unblank () 1254rxvt_term::pointer_unblank ()
1205{ 1255{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1256 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1257 recolour_cursor ();
1208 1258
… …
1213 pointer_ev.start (pointerBlankDelay); 1263 pointer_ev.start (pointerBlankDelay);
1214#endif 1264#endif
1215} 1265}
1216 1266
1217#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1218void 1268void ecb_cold
1219rxvt_term::pointer_blank () 1269rxvt_term::pointer_blank ()
1220{ 1270{
1221 if (!option (Opt_pointerBlank)) 1271 if (!option (Opt_pointerBlank))
1222 return; 1272 return;
1223 1273
… …
1225 XFlush (dpy); 1275 XFlush (dpy);
1226 1276
1227 hidden_pointer = 1; 1277 hidden_pointer = 1;
1228} 1278}
1229 1279
1230void 1280void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1281rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1282{
1233 make_current (); 1283 make_current ();
1234 1284
1235 pointer_blank (); 1285 pointer_blank ();
… …
1241{ 1291{
1242 int button_number, key_state = 0; 1292 int button_number, key_state = 0;
1243 int x, y; 1293 int x, y;
1244 int code = 32; 1294 int code = 32;
1245 1295
1246 x = Pixel2Col (ev.x); 1296 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1297 y = Pixel2Row (ev.y) + 1;
1298
1248 if (ev.type == MotionNotify) 1299 if (ev.type == MotionNotify)
1249 { 1300 {
1250 if (x == mouse_row && y == mouse_col) 1301 if (x == mouse_row && y == mouse_col)
1251 return; 1302 return;
1303
1252 mouse_row = x; 1304 mouse_row = x;
1253 mouse_col = y; 1305 mouse_col = y;
1254 code += 32; 1306 code += 32;
1255 } 1307 }
1256 1308
… …
1259 else 1311 else
1260 { 1312 {
1261 button_number = MEvent.button - Button1; 1313 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1314 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1315 if (button_number >= 3)
1264 button_number += (64 - 3); 1316 button_number += 64 - 3;
1265 } 1317 }
1266 1318
1267 if (priv_modes & PrivMode_MouseX10) 1319 if (priv_modes & PrivMode_MouseX10)
1268 { 1320 {
1269 /* 1321 /*
… …
1301 fputc ('A', stderr); 1353 fputc ('A', stderr);
1302 if (key_state & 32) 1354 if (key_state & 32)
1303 fputc ('2', stderr); 1355 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1356 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1357 button_number,
1306 x + 1, 1358 x,
1307 y + 1); 1359 y);
1308#endif 1360#endif
1309 1361
1362#if ENABLE_FRILLS
1363 if (priv_modes & PrivMode_ExtMouseRight)
1364 tt_printf ("\033[%d;%d;%dM",
1365 code + button_number + key_state,
1366 x,
1367 y);
1368 else if (priv_modes & PrivMode_ExtModeMouse)
1369 tt_printf ("\033[M%c%lc%lc",
1370 code + button_number + key_state,
1371 wint_t (32 + x),
1372 wint_t (32 + y));
1373 else
1374#endif
1310 tt_printf ("\033[M%c%c%c", 1375 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1376 code + button_number + key_state,
1312 (32 + x + 1), 1377 32 + x,
1313 (32 + y + 1)); 1378 32 + y);
1314} 1379}
1315 1380
1316/*{{{ process an X event */ 1381/*{{{ process an X event */
1317void 1382void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1383rxvt_term::x_cb (XEvent &ev)
1319{ 1384{
1320 make_current (); 1385 make_current ();
1321 1386
1322 dLocal (Display *, dpy); 1387 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1485 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1486 focus_out ();
1422 break; 1487 break;
1423 1488
1424 case ConfigureNotify: 1489 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1490 if (ev.xconfigure.window == parent)
1429 { 1491 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1493 ;
1494
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496
1497 bool moved = false;
1498#ifdef HAVE_BG_PIXMAP
1499 if (bg_window_position_sensitive ())
1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
1506
1507 if (want_position_change)
1508 {
1509 int x, y;
1510
1511 if (ev.xconfigure.send_event)
1512 {
1513 x = ev.xconfigure.x;
1514 y = ev.xconfigure.y;
1515 }
1516 else
1517 get_window_origin (x, y);
1518
1519 if (x != parent_x || y != parent_y)
1520 {
1521 parent_x = x;
1522 parent_y = y;
1523 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1524 moved = true;
1525 }
1526 }
1432 1527
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1529 {
1435 seen_resize = 1; 1530 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1532 }
1438 else 1533 else
1439 { 1534 {
1440#ifdef HAVE_BG_PIXMAP 1535#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1536 if (moved)
1444 update_background (); 1537 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1538#endif
1449 } 1539 }
1450 1540
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1542 }
1453 break; 1543 break;
1454 1544
1455 case PropertyNotify: 1545 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1546 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1547 break;
1462 1548
1463 case SelectionClear: 1549 case SelectionClear:
1464 selection_clear (); 1550 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1551 break;
1471 1552
1472 case SelectionRequest: 1553 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1554 selection_send (ev.xselectionrequest);
1474 break; 1555 break;
1475 1556
1476 case MapNotify: 1557 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1558#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1559 // This is needed at startup for the case of no window manager
1479 * non-reparenting window manager. In those cases we never get first 1560 // or a non-reparenting window manager and also because we
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1561 // defer bg image updates if the window is not mapped. The
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1562 // short delay is to optimize for multiple ConfigureNotify
1482 * reparenting. 1563 // events at startup when the window manager reparents the
1483 * We should not render background immidiately, as there could be several 1564 // window, so as to perform the computation after we have
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1565 // received all of them.
1485 * by scheduling background redraw as soon as we can, but giving a short 1566 if (bg_img == 0)
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025); 1567 update_background_ev.start (0.025);
1492#endif 1568#endif
1493 mapped = 1; 1569 mapped = 1;
1494#ifdef TEXT_BLINK 1570#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1571 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1511 { 1587 {
1512 do 1588 do
1513 { 1589 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1590 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1591 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1592 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1594
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1596
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1597 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1598 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1601 }
1526 1602
1527 want_refresh = 1; 1603 want_refresh = 1;
1528 } 1604 }
1529 else 1605 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1611 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1612 ;
1537 1613
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1614 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1615 {
1540 scrollBar.state = STATE_IDLE; 1616 scrollBar.state = SB_STATE_IDLE;
1541 scrollBar.show (0); 1617 scrollBar.show (0);
1542 } 1618 }
1543 } 1619 }
1544 break; 1620 break;
1545 1621
… …
1587 1663
1588#ifdef SELECTION_SCROLLING 1664#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1665 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1666 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1667 {
1668 page_dirn scroll_selection_dir;
1592 int dist; 1669 int dist;
1593 1670
1594 /* don't clobber the current delay if we are 1671 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1672 * already in the middle of scrolling.
1596 */ 1673 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1688 dist = int_bwidth - ev.xbutton.y;
1612 } 1689 }
1613 else 1690 else
1614 { 1691 {
1615 scroll_selection_dir = DN; 1692 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1693 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1694 }
1618 1695
1619 scroll_selection_lines = Pixel2Height (dist) 1696 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1697 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1698 + 1;
1622 min_it (scroll_selection_lines, 1699 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1700 SELECTION_SCROLL_MAX_LINES);
1701 scroll_selection_lines *= scroll_selection_dir;
1624 } 1702 }
1625 else 1703 else
1626 { 1704 {
1627 /* we are within the text window, so we 1705 /* we are within the text window, so we
1628 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1633#ifdef MOUSE_THRESHOLD 1711#ifdef MOUSE_THRESHOLD
1634 } 1712 }
1635#endif 1713#endif
1636 } 1714 }
1637 } 1715 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1717 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1719 MotionNotify, &ev))
1642 ; 1720 ;
1643 1721
1644 XQueryPointer (dpy, scrollBar.win, 1722 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1723 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1724 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1725 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1726 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1727 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1728 scrollBar.size ());
1651 want_refresh = 1; 1729 want_refresh = 1;
1652 scrollBar.show (1); 1730 scrollBar.show (1);
1653 } 1731 }
1654 break; 1732 break;
1655 } 1733 }
1656 1734
1657#if defined(CURSOR_BLINK) 1735#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1736 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1737 cursor_blink_reset ();
1667 }
1668#endif 1738#endif
1669 1739
1670#if defined(POINTER_BLANK) 1740#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1741 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1742 {
… …
1682#endif 1752#endif
1683 1753
1684 refresh_check (); 1754 refresh_check ();
1685} 1755}
1686 1756
1687void 1757#if ENABLE_FRILLS
1758void ecb_cold
1688rxvt_term::set_urgency (bool enable) 1759rxvt_term::set_urgency (bool enable)
1689{ 1760{
1690 if (enable == urgency_hint) 1761 if (enable == urgency_hint)
1691 return; 1762 return;
1692 1763
1693 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1764 if (XWMHints *h = XGetWMHints (dpy, parent))
1694 { 1765 {
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1766 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1767 XSetWMHints (dpy, parent, h);
1697 urgency_hint = enable; 1768 urgency_hint = enable;
1769 XFree (h);
1698 } 1770 }
1699} 1771}
1772#endif
1700 1773
1701void 1774void ecb_cold
1702rxvt_term::focus_in () 1775rxvt_term::focus_in ()
1703{ 1776{
1704 if (!focus) 1777 if (!focus)
1705 { 1778 {
1706 focus = 1; 1779 focus = 1;
1707 want_refresh = 1; 1780 want_refresh = 1;
1708 1781
1709#if USE_XIM 1782#if USE_XIM
1710 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1711 { 1784 {
1712 IMSetPosition (); 1785 im_set_position ();
1713 XSetICFocus (Input_Context); 1786 XSetICFocus (Input_Context);
1714 } 1787 }
1715#endif 1788#endif
1716#if CURSOR_BLINK 1789#if CURSOR_BLINK
1717 if (option (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
… …
1731 1804
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733 } 1806 }
1734} 1807}
1735 1808
1736void 1809void ecb_cold
1737rxvt_term::focus_out () 1810rxvt_term::focus_out ()
1738{ 1811{
1739 if (focus) 1812 if (focus)
1740 { 1813 {
1741 focus = 0; 1814 focus = 0;
… …
1774 1847
1775 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1776 } 1849 }
1777} 1850}
1778 1851
1779void 1852void ecb_cold
1780rxvt_term::update_fade_color (unsigned int idx) 1853rxvt_term::update_fade_color (unsigned int idx)
1781{ 1854{
1782#if OFF_FOCUS_FADING 1855#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1856 if (rs[Rs_fade])
1784 { 1857 {
… …
1787 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1788 } 1861 }
1789#endif 1862#endif
1790} 1863}
1791 1864
1792#if ENABLE_TRANSPARENCY || ENABLE_PERL 1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1793void 1866void ecb_hot
1794rxvt_term::rootwin_cb (XEvent &ev) 1867rxvt_term::rootwin_cb (XEvent &ev)
1795{ 1868{
1796 make_current (); 1869 make_current ();
1797 1870
1798 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1871 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1799 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1872 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1800 return; 1873 return;
1801 1874
1802# if ENABLE_TRANSPARENCY
1803 switch (ev.type) 1875 switch (ev.type)
1804 { 1876 {
1805 case PropertyNotify: 1877 case PropertyNotify:
1806 /* 1878 /*
1807 * if user used some Esetroot compatible prog to set the root bg, 1879 * if user used some Esetroot compatible prog to set the root bg,
1808 * use the property to determine the pixmap. We use it later on. 1880 * use the property to determine the pixmap. We use it later on.
1809 */ 1881 */
1810 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1811 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1812 { 1884 {
1813 bgPixmap.set_root_pixmap (); 1885#if BG_IMAGE_FROM_ROOT
1886 if (option (Opt_transparent))
1887 {
1888 rxvt_img::new_from_root (this)->replace (root_img);
1814 update_background (); 1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1815 } 1893 }
1816 1894
1817 break; 1895 break;
1818 } 1896 }
1819# endif
1820 1897
1821 refresh_check (); 1898 refresh_check ();
1822} 1899}
1823#endif 1900#endif
1824 1901
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1934 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1935 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1936#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1937 if (ev.button == MEvent.button && clickintime)
1861 { 1938 {
1862 /* same button, within alloted time */ 1939 /* same button, within allowed time */
1863 MEvent.clicks++; 1940 MEvent.clicks++;
1864 1941
1865 if (MEvent.clicks > 1) 1942 if (MEvent.clicks > 1)
1866 { 1943 {
1867 /* only report double clicks */ 1944 /* only report double clicks */
… …
1948 if (scrollBar.upButton (ev.y)) 2025 if (scrollBar.upButton (ev.y))
1949 direction = UP; /* up */ 2026 direction = UP; /* up */
1950 else if (scrollBar.dnButton (ev.y)) 2027 else if (scrollBar.dnButton (ev.y))
1951 direction = DN; /* down */ 2028 direction = DN; /* down */
1952 2029
1953 scrollBar.state = STATE_IDLE; 2030 scrollBar.state = SB_STATE_IDLE;
1954 /* 2031 /*
1955 * Rxvt-style scrollbar: 2032 * Rxvt-style scrollbar:
1956 * move up if mouse is above slider 2033 * move up if mouse is above slider
1957 * move dn if mouse is below slider 2034 * move dn if mouse is below slider
1958 * 2035 *
… …
1997 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2074 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 2075#endif
1999 if (scr_page (direction, 1)) 2076 if (scr_page (direction, 1))
2000 { 2077 {
2001 if (direction == UP) 2078 if (direction == UP)
2002 scrollBar.state = STATE_UP; 2079 scrollBar.state = SB_STATE_UP;
2003 else 2080 else
2004 scrollBar.state = STATE_DOWN; 2081 scrollBar.state = SB_STATE_DOWN;
2005 } 2082 }
2006 } 2083 }
2007 else 2084 else
2008 switch (ev.button) 2085 switch (ev.button)
2009 { 2086 {
2010 case Button2: 2087 case Button2:
2011 switch (scrollBar.align) 2088 switch (scrollBar.align)
2012 { 2089 {
2013 case R_SB_ALIGN_TOP: 2090 case SB_ALIGN_TOP:
2014 csrO = 0; 2091 csrO = 0;
2015 break; 2092 break;
2016 case R_SB_ALIGN_CENTRE: 2093 case SB_ALIGN_CENTRE:
2017 csrO = (scrollBar.bot - scrollBar.top) / 2; 2094 csrO = (scrollBar.bot - scrollBar.top) / 2;
2018 break; 2095 break;
2019 case R_SB_ALIGN_BOTTOM: 2096 case SB_ALIGN_BOTTOM:
2020 csrO = scrollBar.bot - scrollBar.top; 2097 csrO = scrollBar.bot - scrollBar.top;
2021 break; 2098 break;
2022 } 2099 }
2023 2100
2024 if (scrollBar.style == R_SB_XTERM 2101 if (scrollBar.style == SB_STYLE_XTERM
2025 || scrollbar_above_slider (ev.y) 2102 || scrollBar.above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2103 || scrollBar.below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2104 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2028 2105
2029 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2030 break; 2107 break;
2031 2108
2032 case Button1: 2109 case Button1:
2033 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2110 if (scrollBar.align == SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2111 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2112 /* FALLTHROUGH */
2036 2113
2037 case Button3: 2114 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2115 if (scrollBar.style != SB_STYLE_XTERM)
2039 { 2116 {
2040 if (scrollbar_above_slider (ev.y)) 2117 if (scrollBar.above_slider (ev.y))
2041# ifdef RXVT_SCROLL_FULL 2118# ifdef RXVT_SCROLL_FULL
2042 scr_page (UP, nrow - 1); 2119 scr_page (UP, nrow - 1);
2043# else 2120# else
2044 scr_page (UP, nrow / 4); 2121 scr_page (UP, nrow / 4);
2045# endif 2122# endif
2046 else if (scrollbar_below_slider (ev.y)) 2123 else if (scrollBar.below_slider (ev.y))
2047# ifdef RXVT_SCROLL_FULL 2124# ifdef RXVT_SCROLL_FULL
2048 scr_page (DN, nrow - 1); 2125 scr_page (DN, nrow - 1);
2049# else 2126# else
2050 scr_page (DN, nrow / 4); 2127 scr_page (DN, nrow / 4);
2051# endif 2128# endif
2052 else 2129 else
2053 scrollBar.state = STATE_MOTION; 2130 scrollBar.state = SB_STATE_MOTION;
2054 } 2131 }
2055 else 2132 else
2056 { 2133 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2134 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2135 (nrow
2059 * scrollbar_position (ev.y) 2136 * scrollBar.position (ev.y)
2060 / scrollBar.size ())); 2137 / scrollBar.size ()));
2061 } 2138 }
2062 2139
2063 break; 2140 break;
2064 } 2141 }
… …
2075 2152
2076 csrO = 0; /* reset csr Offset */ 2153 csrO = 0; /* reset csr Offset */
2077 if (!bypass_keystate) 2154 if (!bypass_keystate)
2078 reportmode = !! (priv_modes & PrivMode_mouse_report); 2155 reportmode = !! (priv_modes & PrivMode_mouse_report);
2079 2156
2080 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2157 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2081 { 2158 {
2082 scrollBar.state = STATE_IDLE; 2159 scrollBar.state = SB_STATE_IDLE;
2083 scrollBar.show (0); 2160 scrollBar.show (0);
2084 } 2161 }
2085 2162
2086#ifdef SELECTION_SCROLLING 2163#ifdef SELECTION_SCROLLING
2087 sel_scroll_ev.stop(); 2164 sel_scroll_ev.stop();
… …
2137 case Button3: 2214 case Button3:
2138 selection_make (ev.time); 2215 selection_make (ev.time);
2139 break; 2216 break;
2140 2217
2141 case Button2: 2218 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2219 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2220 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2221 break;
2145 2222
2146#ifdef MOUSE_WHEEL 2223#ifdef MOUSE_WHEEL
2147 case Button4: 2224 case Button4:
2148 case Button5: 2225 case Button5:
2149 { 2226 {
2150 int i; 2227 int lines;
2151 page_dirn v; 2228 page_dirn dirn;
2152 2229
2153 v = ev.button == Button4 ? UP : DN; 2230 dirn = ev.button == Button4 ? UP : DN;
2154 2231
2155 if (ev.state & ShiftMask) 2232 if (ev.state & ShiftMask)
2156 i = 1; 2233 lines = 1;
2157 else if (option (Opt_mouseWheelScrollPage)) 2234 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2235 lines = nrow - 1;
2159 else 2236 else
2160 i = 5; 2237 lines = 5;
2161 2238
2162# ifdef MOUSE_SLIP_WHEELING 2239# ifdef MOUSE_SLIP_WHEELING
2163 if (ev.state & ControlMask) 2240 if (ev.state & ControlMask)
2164 { 2241 {
2165 mouse_slip_wheel_speed += v ? -1 : 1; 2242 mouse_slip_wheel_speed += dirn;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2243 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168 2244
2169 if (!slip_wheel_ev.is_active ()) 2245 if (!slip_wheel_ev.is_active ())
2170 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2246 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171 } 2247 }
2172 else 2248 else
2173# endif 2249# endif
2174 { 2250 {
2175 scr_page (v, i); 2251 scr_page (dirn, lines);
2176 scrollBar.show (1); 2252 scrollBar.show (1);
2177 } 2253 }
2178 } 2254 }
2179 break; 2255 break;
2180#endif 2256#endif
… …
2182 } 2258 }
2183} 2259}
2184 2260
2185/*}}} */ 2261/*}}} */
2186 2262
2187bool 2263void ecb_hot
2188rxvt_term::cmd_parse () 2264rxvt_term::cmd_parse ()
2189{ 2265{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2266 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2267 char *seq_begin; // remember start of esc-sequence here
2193 2268
2194 for (;;) 2269 for (;;)
2195 { 2270 {
2196 if (expect_false (ch == NOCHAR)) 2271 if (ecb_unlikely (ch == NOCHAR))
2197 { 2272 {
2198 seq_begin = cmdbuf_ptr; 2273 seq_begin = cmdbuf_ptr;
2199 ch = next_char (); 2274 ch = next_char ();
2200 2275
2201 if (ch == NOCHAR) 2276 if (ch == NOCHAR)
2202 break; 2277 break;
2203 } 2278 }
2204 2279
2205 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2280 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2206 { 2281 {
2207 if (expect_false (!seen_input)) 2282 if (ecb_unlikely (!seen_input))
2208 { 2283 {
2209 seen_input = 1; 2284 seen_input = 1;
2210 // many badly-written programs (e.g. jed) contain a race condition: 2285 // many badly-written programs (e.g. jed) contain a race condition:
2211 // they first read the screensize and then install a SIGWINCH handler. 2286 // they first read the screensize and then install a SIGWINCH handler.
2212 // some window managers resize the window early, and these programs 2287 // some window managers resize the window early, and these programs
… …
2225 wchar_t *str = buf; 2300 wchar_t *str = buf;
2226 wchar_t *eol = str + min (ncol, UBUFSIZ); 2301 wchar_t *eol = str + min (ncol, UBUFSIZ);
2227 2302
2228 for (;;) 2303 for (;;)
2229 { 2304 {
2230 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2305 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2231 break; 2306 break;
2232 2307
2233 *str++ = ch; 2308 *str++ = ch;
2234 2309
2235 if (expect_false (ch == C0_LF || str >= eol)) 2310 if (ecb_unlikely (ch == C0_LF || str >= eol))
2236 { 2311 {
2237 if (ch == C0_LF) 2312 if (ch == C0_LF)
2238 nlines++; 2313 nlines++;
2239 2314
2240 refresh_count++; 2315 refresh_count++;
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2364 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2365 * if skipScroll is enabled.
2291 */ 2366 */
2292 if (refreshnow) 2367 if (refreshnow)
2293 { 2368 {
2294 flag = true;
2295 scr_refresh (); 2369 scr_refresh ();
2296 want_refresh = 1; 2370 want_refresh = 1;
2297 } 2371 }
2298
2299 } 2372 }
2300 else 2373 else
2301 { 2374 {
2302 try 2375 try
2303 { 2376 {
… …
2311 } 2384 }
2312 2385
2313 ch = NOCHAR; 2386 ch = NOCHAR;
2314 } 2387 }
2315 } 2388 }
2316
2317 return flag;
2318} 2389}
2319 2390
2320// read the next character 2391// read the next character
2321wchar_t 2392wchar_t ecb_hot
2322rxvt_term::next_char () NOTHROW 2393rxvt_term::next_char () NOTHROW
2323{ 2394{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2395 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2396 {
2326 // assume 7-bit to be ascii ALWAYS 2397 // assume 7-bit to be ascii ALWAYS
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328 return *cmdbuf_ptr++; 2399 return *cmdbuf_ptr++;
2329 2400
2330 wchar_t wc; 2401 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2402 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2403
… …
2337 break; 2408 break;
2338 } 2409 }
2339 2410
2340 if (len == (size_t)-1) 2411 if (len == (size_t)-1)
2341 { 2412 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2413 mbstate.reset (); // reset now undefined conversion state
2414 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2415 // in which case we "erroneously" return the next byte which might be valid.
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2416 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2417 }
2345 2418
2346 // assume wchar == unicode 2419 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2420 cmdbuf_ptr += len;
… …
2350 2423
2351 return NOCHAR; 2424 return NOCHAR;
2352} 2425}
2353 2426
2354// read the next octet 2427// read the next octet
2355uint32_t 2428uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2429rxvt_term::next_octet () NOTHROW
2357{ 2430{
2358 return cmdbuf_ptr < cmdbuf_endp 2431 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2432 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2433 : NOCHAR;
2361} 2434}
2362 2435
2363static class out_of_input out_of_input; 2436static class out_of_input out_of_input;
2364 2437
2365/* rxvt_cmd_getc () - Return next input character */ 2438wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2439rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2440{
2373 wchar_t c = next_char (); 2441 wchar_t c = next_char ();
2374 2442
2375 if (c == NOCHAR) 2443 if (c == NOCHAR)
2376 throw out_of_input; 2444 throw out_of_input;
2377 2445
2378 return c; 2446 return c;
2379} 2447}
2380 2448
2381uint32_t 2449uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2450rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2451{
2384 uint32_t c = next_octet (); 2452 uint32_t c = next_octet ();
2385 2453
2386 if (c == NOCHAR) 2454 if (c == NOCHAR)
… …
2390} 2458}
2391 2459
2392/*{{{ print pipe */ 2460/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2461/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2462#ifdef PRINTPIPE
2395FILE * 2463FILE * ecb_cold
2396rxvt_term::popen_printer () 2464rxvt_term::popen_printer ()
2397{ 2465{
2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2466 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2467
2400 if (stream == NULL) 2468 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2469 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2470
2403 return stream; 2471 return stream;
2404} 2472}
2405 2473
2406int 2474int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2475rxvt_term::pclose_printer (FILE *stream)
2408{ 2476{
2409 fflush (stream); 2477 fflush (stream);
2410 return pclose (stream); 2478 return pclose (stream);
2411} 2479}
2412 2480
2413/* 2481/*
2414 * simulate attached vt100 printer 2482 * simulate attached vt100 printer
2415 */ 2483 */
2416void 2484void ecb_cold
2417rxvt_term::process_print_pipe () 2485rxvt_term::process_print_pipe ()
2418{ 2486{
2419 FILE *fd = popen_printer (); 2487 FILE *fd = popen_printer ();
2420 2488
2421 if (!fd) 2489 if (!fd)
… …
2467 pclose_printer (fd); 2535 pclose_printer (fd);
2468} 2536}
2469#endif /* PRINTPIPE */ 2537#endif /* PRINTPIPE */
2470/*}}} */ 2538/*}}} */
2471 2539
2472/* *INDENT-OFF* */
2473enum { 2540enum {
2474 C1_40 = 0x40, 2541 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2542 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2543 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2544 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2545 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2546};
2480/* *INDENT-ON* */
2481 2547
2482/*{{{ process non-printing single characters */ 2548/*{{{ process non-printing single characters */
2483void 2549void ecb_hot
2484rxvt_term::process_nonprinting (unicode_t ch) 2550rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2551{
2486 switch (ch) 2552 switch (ch)
2487 { 2553 {
2488 case C0_ESC: 2554 case C0_ESC:
… …
2534} 2600}
2535/*}}} */ 2601/*}}} */
2536 2602
2537 2603
2538/*{{{ process VT52 escape sequences */ 2604/*{{{ process VT52 escape sequences */
2539void 2605void ecb_cold
2540rxvt_term::process_escape_vt52 (unicode_t ch) 2606rxvt_term::process_escape_vt52 (unicode_t ch)
2541{ 2607{
2542 int row, col; 2608 int row, col;
2543 2609
2544 switch (ch) 2610 switch (ch)
… …
2578 break; 2644 break;
2579 case 'Z': /* identify the terminal type */ 2645 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2646 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2647 break;
2582 case '<': /* turn off VT52 mode */ 2648 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2649 priv_modes &= ~PrivMode_vt52;
2584 break; 2650 break;
2585 case 'F': /* use special graphics character set */ 2651 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2652 case 'G': /* use regular character set */
2587 /* unimplemented */ 2653 /* unimplemented */
2588 break; 2654 break;
… …
2594} 2660}
2595/*}}} */ 2661/*}}} */
2596 2662
2597 2663
2598/*{{{ process escape sequences */ 2664/*{{{ process escape sequences */
2599void 2665void ecb_hot
2600rxvt_term::process_escape_seq () 2666rxvt_term::process_escape_seq ()
2601{ 2667{
2602 unicode_t ch = cmd_getc (); 2668 unicode_t ch = cmd_getc ();
2603 2669
2604 if (priv_modes & PrivMode_vt52) 2670 if (priv_modes & PrivMode_vt52)
… …
2607 return; 2673 return;
2608 } 2674 }
2609 2675
2610 switch (ch) 2676 switch (ch)
2611 { 2677 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2678 case '#':
2614 if (cmd_getc () == '8') 2679 if (cmd_getc () == '8')
2615 scr_E (); 2680 scr_E ();
2616 break; 2681 break;
2617 case '(': 2682 case '(':
… …
2640#if !ENABLE_MINIMAL 2705#if !ENABLE_MINIMAL
2641 case '9': 2706 case '9':
2642 scr_forwardindex (); 2707 scr_forwardindex ();
2643 break; 2708 break;
2644#endif 2709#endif
2710 // DECPAM/DECPNM
2645 case '=': 2711 case '=':
2712 priv_modes |= PrivMode_aplKP;
2713 break;
2646 case '>': 2714 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2715 priv_modes &= ~PrivMode_aplKP;
2648 break; 2716 break;
2649 2717
2650 case C1_40: 2718 case C1_40:
2651 cmd_getc (); 2719 cmd_getc ();
2652 break; 2720 break;
… …
2656 2724
2657 /* 8.3.87: NEXT LINE */ 2725 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2726 case C1_NEL: /* ESC E */
2659 { 2727 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2728 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2730 }
2663 break; 2731 break;
2664 2732
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2733 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2734 case C1_ESA: /* ESC G */
2667 process_graphics (); 2735 // used by original rxvt for rob nations own graphics mode
2736 if (cmd_getc () == 'Q')
2737 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2738 break;
2669 2739
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2740 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2741 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2742 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2746 case C1_RI: /* ESC M */
2677 scr_index (DN); 2747 scr_index (DN);
2678 break; 2748 break;
2679 2749
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2750 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2751 /* case C1_SS2: break; */
2682 2752
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2753 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2754 /* case C1_SS3: break; */
2685 2755
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2756 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2757 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2758 process_dcs_seq ();
2689 break; 2759 break;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2761 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2762 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2763 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2764 break; /* steal obsolete ESC [ c */
2695 2765
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2766 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2767 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2768 process_csi_seq ();
2699 break; 2769 break;
2700 2770
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2771 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2772 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2773 process_osc_seq ();
2704 break; 2774 break;
2705 2775
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2776 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2777 case 'c':
2708 mbstate.reset (); 2778 mbstate.reset ();
2709 scr_poweron (); 2779 scr_poweron ();
2710 scrollBar.show (1); 2780 scrollBar.show (1);
2711 break; 2781 break;
… …
2722 } 2792 }
2723} 2793}
2724/*}}} */ 2794/*}}} */
2725 2795
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2796/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2797enum {
2729 CSI_ICH = 0x40, 2798 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2799 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2800 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2801 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2804 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2805 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2806 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2807};
2739 2808
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2809#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2810 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2811 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2812#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2813 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2814
2746const unsigned char csi_defaults[] = 2815static const unsigned char csi_defaults[] =
2747 { 2816 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2817 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2818 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2819 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2820 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2821 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2822 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2825 };
2757/* *INDENT-ON* */
2758 2826
2759void 2827void ecb_hot
2760rxvt_term::process_csi_seq () 2828rxvt_term::process_csi_seq ()
2761{ 2829{
2762 unicode_t ch, priv, i; 2830 unicode_t ch, priv, prev_ch, i;
2763 unsigned int nargs, p; 2831 unsigned int nargs, p;
2764 int n, ndef; 2832 int n, ndef;
2765 int arg[ESC_ARGS] = { }; 2833 int arg[ESC_ARGS] = { };
2766 2834
2767 nargs = 0; 2835 nargs = 0;
2768 2836
2769 priv = 0; 2837 priv = 0;
2770 ch = cmd_getc (); 2838 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2839 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2840 {
2773 /* '<' '=' '>' '?' */ 2841 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2842 priv = ch;
2775 ch = cmd_getc (); 2843 ch = cmd_getc ();
2776 } 2844 }
2777 2845
2846 prev_ch = 0;
2778 /* read any numerical arguments */ 2847 /* read any numerical arguments */
2779 for (n = -1; ch < CSI_ICH; ) 2848 for (n = -1; ch < CSI_ICH; )
2780 { 2849 {
2781 if (isdigit (ch)) 2850 if (isdigit (ch))
2782 { 2851 {
… …
2792 n = -1; 2861 n = -1;
2793 } 2862 }
2794 else if (IS_CONTROL (ch)) 2863 else if (IS_CONTROL (ch))
2795 process_nonprinting (ch); 2864 process_nonprinting (ch);
2796 2865
2866 prev_ch = ch;
2797 ch = cmd_getc (); 2867 ch = cmd_getc ();
2798 } 2868 }
2799 2869
2800 if (ch > CSI_7F) 2870 if (ch > CSI_7F)
2801 return; 2871 return;
… …
2832 2902
2833 case '?': 2903 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2904 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2905 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2906 break;
2907
2908 case '!':
2909 if (ch == CSI_70)
2910 {
2911 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2912 scr_soft_reset ();
2913
2914 static const int pm_h[] = { 7, 25 };
2915 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2916
2917 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2918 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2837 } 2919 }
2920 break;
2921 }
2922
2838 return; 2923 return;
2839 } 2924 }
2840 2925
2841 switch (ch) 2926 switch (ch)
2842 { 2927 {
… …
2856 } 2941 }
2857 break; 2942 break;
2858#endif 2943#endif
2859 2944
2860 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2945 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2861 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2946 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2862 arg[0] = -arg[0]; 2947 arg[0] = -arg[0];
2863 /* FALLTHROUGH */ 2948 /* FALLTHROUGH */
2864 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2949 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2865 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2866 scr_gotorc (arg[0], 0, RELATIVE); 2951 scr_gotorc (arg[0], 0, RELATIVE);
2867 break; 2952 break;
2868 2953
2869 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2870 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3020 scr_insert_mode (1); 3105 scr_insert_mode (1);
3021 else if (arg[0] == 20) 3106 else if (arg[0] == 20)
3022 priv_modes |= PrivMode_LFNL; 3107 priv_modes |= PrivMode_LFNL;
3023 break; 3108 break;
3024 3109
3110 case CSI_71: // DESCUSR: set cursor style
3111 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]);
3113 break;
3114
3025 /* 3115 /*
3026 * PRIVATE USE beyond this point. All CSI_7? sequences here 3116 * PRIVATE USE beyond this point. All CSI_7? sequences here
3027 */ 3117 */
3028 case CSI_72: /* DECSTBM: set top and bottom margins */ 3118 case CSI_72: /* DECSTBM: set top and bottom margins */
3029 if (nargs == 1) 3119 if (nargs == 1)
… …
3057 } 3147 }
3058} 3148}
3059/*}}} */ 3149/*}}} */
3060 3150
3061#if !ENABLE_MINIMAL 3151#if !ENABLE_MINIMAL
3062/* ARGSUSED */
3063void 3152void
3064rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3153rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3065{ 3154{
3066 int x, y; 3155 int x, y;
3067 XWindowAttributes wattr; 3156 XWindowAttributes wattr;
… …
3076 { 3165 {
3077 /* 3166 /*
3078 * commands 3167 * commands
3079 */ 3168 */
3080 case 1: /* deiconify window */ 3169 case 1: /* deiconify window */
3081 XMapWindow (dpy, parent[0]); 3170 XMapWindow (dpy, parent);
3082 break; 3171 break;
3083 case 2: /* iconify window */ 3172 case 2: /* iconify window */
3084 XIconifyWindow (dpy, parent[0], display->screen); 3173 XIconifyWindow (dpy, parent, display->screen);
3085 break; 3174 break;
3086 case 3: /* set position (pixels) */ 3175 case 3: /* set position (pixels) */
3087 XMoveWindow (dpy, parent[0], args[1], args[2]); 3176 XMoveWindow (dpy, parent, args[1], args[2]);
3088 break; 3177 break;
3089 case 4: /* set size (pixels) */ 3178 case 4: /* set size (pixels) */
3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3179 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3091 break; 3180 break;
3092 case 5: /* raise window */ 3181 case 5: /* raise window */
3093 XRaiseWindow (dpy, parent[0]); 3182 XRaiseWindow (dpy, parent);
3094 break; 3183 break;
3095 case 6: /* lower window */ 3184 case 6: /* lower window */
3096 XLowerWindow (dpy, parent[0]); 3185 XLowerWindow (dpy, parent);
3097 break; 3186 break;
3098 case 7: /* refresh window */ 3187 case 7: /* refresh window */
3099 scr_touch (true); 3188 scr_touch (true);
3100 break; 3189 break;
3101 case 8: /* set size (chars) */ 3190 case 8: /* set size (chars) */
… …
3104 break; 3193 break;
3105 3194
3106 //case 9: NYI, TODO, restore maximized window or maximize window 3195 //case 9: NYI, TODO, restore maximized window or maximize window
3107 default: 3196 default:
3108 if (args[0] >= 24) /* set height (chars) */ 3197 if (args[0] >= 24) /* set height (chars) */
3109 set_widthheight ((unsigned int)width, 3198 set_widthheight ((unsigned int)vt_width,
3110 (unsigned int) (args[1] * fheight)); 3199 (unsigned int) (args[1] * fheight));
3111 break; 3200 break;
3112 3201
3113 /* 3202 /*
3114 * reports - some output format copied from XTerm 3203 * reports - some output format copied from XTerm
3115 */ 3204 */
3116 case 11: /* report window state */ 3205 case 11: /* report window state */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3207 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3119 break; 3208 break;
3120 case 13: /* report window position */ 3209 case 13: /* report window position */
3121 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3122 XTranslateCoordinates (dpy, parent[0], wattr.root, 3211 XTranslateCoordinates (dpy, parent, wattr.root,
3123 -wattr.border_width, -wattr.border_width, 3212 -wattr.border_width, -wattr.border_width,
3124 &x, &y, &wdummy); 3213 &x, &y, &wdummy);
3125 tt_printf ("\033[3;%d;%dt", x, y); 3214 tt_printf ("\033[3;%d;%dt", x, y);
3126 break; 3215 break;
3127 case 14: /* report window size (pixels) */ 3216 case 14: /* report window size (pixels) */
3128 XGetWindowAttributes (dpy, parent[0], &wattr); 3217 XGetWindowAttributes (dpy, parent, &wattr);
3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3218 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3130 break; 3219 break;
3131 case 18: /* report text area size (chars) */ 3220 case 18: /* report text area size (chars) */
3132 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3221 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3133 break; 3222 break;
… …
3135 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3136 break; 3225 break;
3137 case 20: /* report icon label */ 3226 case 20: /* report icon label */
3138 { 3227 {
3139 char *s; 3228 char *s;
3140 XGetIconName (dpy, parent[0], &s); 3229 XGetIconName (dpy, parent, &s);
3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3142 XFree (s); 3231 XFree (s);
3143 } 3232 }
3144 break; 3233 break;
3145 case 21: /* report window title */ 3234 case 21: /* report window title */
3146 { 3235 {
3147 char *s; 3236 char *s;
3148 XFetchName (dpy, parent[0], &s); 3237 XFetchName (dpy, parent, &s);
3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3238 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3239 XFree (s);
3151 } 3240 }
3152 break; 3241 break;
3153 } 3242 }
… …
3163rxvt_term::get_to_st (unicode_t &ends_how) 3252rxvt_term::get_to_st (unicode_t &ends_how)
3164{ 3253{
3165 unicode_t ch; 3254 unicode_t ch;
3166 bool seen_esc = false; 3255 bool seen_esc = false;
3167 unsigned int n = 0; 3256 unsigned int n = 0;
3168 wchar_t string[STRING_MAX]; 3257 wchar_t string[CBUFSIZ];
3169 3258
3170 while ((ch = cmd_getc ()) != NOCHAR) 3259 while ((ch = cmd_getc ()) != NOCHAR)
3171 { 3260 {
3172 if (seen_esc) 3261 if (seen_esc)
3173 { 3262 {
… …
3188 else if (ch < 0x20) 3277 else if (ch < 0x20)
3189 return NULL; /* other control character - exit */ 3278 return NULL; /* other control character - exit */
3190 3279
3191 seen_esc = false; 3280 seen_esc = false;
3192 3281
3193 if (n >= STRING_MAX - 1) 3282 if (n >= sizeof (string) - 1)
3194 // stop at some sane length 3283 // stop at some sane length
3195 return NULL; 3284 return NULL;
3196 3285
3197 string[n++] = ch; 3286 string[n++] = ch;
3198 } 3287 }
… …
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3298 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3299 */
3211void 3300void
3212rxvt_term::process_dcs_seq () 3301rxvt_term::process_dcs_seq ()
3213{ 3302{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3303 /*
3218 * Not handled yet 3304 * Not handled yet
3219 */ 3305 */
3306
3307 unicode_t eh;
3220 s = get_to_st (eh); 3308 char *s = get_to_st (eh);
3221 if (s) 3309 if (s)
3222 free (s); 3310 free (s);
3223 3311
3224 return; 3312 return;
3225} 3313}
… …
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3317 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3318 */
3231void 3319void
3232rxvt_term::process_osc_seq () 3320rxvt_term::process_osc_seq ()
3233{ 3321{
3234 unicode_t ch, eh;
3235 int arg; 3322 int arg;
3236 3323
3237 ch = cmd_getc (); 3324 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3325 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3326 arg = arg * 10 + (ch - '0');
3240 3327
3241 if (ch == ';') 3328 if (ch == ';')
3242 { 3329 {
3330 unicode_t eh;
3243 char *s = get_to_st (eh); 3331 char *s = get_to_st (eh);
3244 3332
3245 if (s) 3333 if (s)
3246 { 3334 {
3247 process_xterm_seq (arg, s, eh); 3335 process_xterm_seq (arg, s, eh);
… …
3271 3359
3272/* 3360/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3361 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3362 */
3275void 3363void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3364rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3365{
3278 int color; 3366 int color;
3279 char *buf, *name; 3367 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3368 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3369 int saveop = op;
… …
3308 unsigned long bytes_after; 3396 unsigned long bytes_after;
3309 unsigned char *value = 0; 3397 unsigned char *value = 0;
3310 const char *str = ""; 3398 const char *str = "";
3311 3399
3312 if (prop 3400 if (prop
3313 && XGetWindowProperty (dpy, parent[0], 3401 && XGetWindowProperty (dpy, parent,
3314 prop, 0, 1<<16, 0, AnyPropertyType, 3402 prop, 0, 1<<16, 0, AnyPropertyType,
3315 &actual_type, &actual_format, 3403 &actual_type, &actual_format,
3316 &nitems, &bytes_after, &value) == Success 3404 &nitems, &bytes_after, &value) == Success
3317 && actual_type != None 3405 && actual_type != None
3318 && actual_format == 8) 3406 && actual_format == 8)
3319 str = (const char *)(value); 3407 str = (const char *)(value);
3320 3408
3321 tt_printf ("\033]%d;%s%c", op, str, resp); 3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3322 3410
3323 XFree (value); 3411 XFree (value);
3324 } 3412 }
3325 else 3413 else
3326 { 3414 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3415 char *eq = strchr (str, '=');
3328 3416
3329 if (eq) 3417 if (eq)
3330 { 3418 {
3331 *eq = 0; 3419 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3420 set_utf8_property (display->atom (str), eq + 1);
3333 } 3421 }
3334 else 3422 else
3335 XDeleteProperty (dpy, parent[0], 3423 XDeleteProperty (dpy, parent,
3336 display->atom (str)); 3424 display->atom (str));
3337 } 3425 }
3338 break; 3426 break;
3339 3427
3340 case XTerm_Color: 3428 case XTerm_Color:
… …
3372 process_color_seq (op, Color_pointer_fg, str, resp); 3460 process_color_seq (op, Color_pointer_fg, str, resp);
3373 break; 3461 break;
3374 case XTerm_Color_pointer_bg: 3462 case XTerm_Color_pointer_bg:
3375 process_color_seq (op, Color_pointer_bg, str, resp); 3463 process_color_seq (op, Color_pointer_bg, str, resp);
3376 break; 3464 break;
3465#ifdef OPTION_HC
3466 case XTerm_Color_HC:
3467 process_color_seq (op, Color_HC, str, resp);
3468 break;
3469 case XTerm_Color_HTC:
3470 process_color_seq (op, Color_HTC, str, resp);
3471 break;
3472#endif
3377#ifndef NO_BOLD_UNDERLINE_REVERSE 3473#ifndef NO_BOLD_UNDERLINE_REVERSE
3378 case XTerm_Color_RV:
3379 process_color_seq (op, Color_RV, str, resp);
3380 break;
3381 case Rxvt_Color_BD:
3382 case URxvt_Color_BD: 3474 case URxvt_Color_BD:
3383 process_color_seq (op, Color_BD, str, resp); 3475 process_color_seq (op, Color_BD, str, resp);
3384 break; 3476 break;
3385 case Rxvt_Color_UL:
3386 case URxvt_Color_UL: 3477 case URxvt_Color_UL:
3387 process_color_seq (op, Color_UL, str, resp); 3478 process_color_seq (op, Color_UL, str, resp);
3388 break; 3479 break;
3389 case URxvt_Color_IT: 3480 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3481 process_color_seq (op, Color_IT, str, resp);
3391 break; 3482 break;
3392#endif 3483#endif
3393#if ENABLE_TRANSPARENCY 3484 case URxvt_Color_border:
3485 process_color_seq (op, Color_border, str, resp);
3486 break;
3487
3488#if BG_IMAGE_FROM_ROOT
3394 case URxvt_Color_tint: 3489 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3490 process_color_seq (op, Color_tint, str, resp);
3396 { 3491 {
3397 bool changed = false; 3492 bool changed = false;
3398 3493
3399 if (ISSET_PIXCOLOR (Color_tint)) 3494 if (ISSET_PIXCOLOR (Color_tint))
3400 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3401 else
3402 changed = bgPixmap.unset_tint ();
3403 3496
3404 if (changed) 3497 if (changed)
3405 update_background (); 3498 update_background ();
3406 } 3499 }
3407 3500
… …
3411#if BG_IMAGE_FROM_FILE 3504#if BG_IMAGE_FROM_FILE
3412 case Rxvt_Pixmap: 3505 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3506 if (!strcmp (str, "?"))
3414 { 3507 {
3415 char str[256]; 3508 char str[256];
3509 int h_scale = fimage.h_scale;
3510 int v_scale = fimage.v_scale;
3511 int h_align = fimage.h_align;
3512 int v_align = fimage.v_align;
3416 3513
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3514 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3515 h_scale, v_scale,
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3516 h_align, v_align);
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3518 }
3422 else 3519 else
3423 { 3520 {
3424 int changed = 0; 3521 bool changed = false;
3425 3522
3426 if (*str != ';') 3523 if (*str != ';')
3427 { 3524 {
3428 /* reset to default scaling :*/ 3525 try
3429 bgPixmap.unset_geometry (); 3526 {
3430 if (bgPixmap.set_file (str)) /* change pixmap */ 3527 fimage.set_file_geometry (this, str);
3431 changed++; 3528 changed = true;
3432 str = strchr (str, ';'); 3529 }
3433 if (str == NULL) 3530 catch (const class rxvt_failure_exception &e)
3434 bgPixmap.set_defaultGeometry (); 3531 {
3532 }
3435 } 3533 }
3436 3534 else
3437 while (str)
3438 { 3535 {
3439 str++; 3536 str++;
3440 if (bgPixmap.set_geometry (str)) 3537 if (fimage.set_geometry (str, true))
3441 changed++; 3538 changed = true;
3442 str = strchr (str, ';');
3443 } 3539 }
3444 3540
3445 if (changed) 3541 if (changed)
3542 {
3543 if (bg_window_position_sensitive ())
3544 {
3545 int x, y;
3546 get_window_origin (x, y);
3547 parent_x = x;
3548 parent_y = y;
3549 }
3446 update_background (); 3550 update_background ();
3551 }
3447 } 3552 }
3448 break; 3553 break;
3449#endif 3554#endif
3450 3555
3451 case XTerm_logfile: 3556 case XTerm_logfile:
… …
3538 * 's' = save 3643 * 's' = save
3539 * 'r' = restore 3644 * 'r' = restore
3540 * 't' = toggle 3645 * 't' = toggle
3541 * so no need for fancy checking 3646 * so no need for fancy checking
3542 */ 3647 */
3543int 3648int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3649rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3650{
3546 int state; 3651 int state;
3547 3652
3548 if (mode == 's') 3653 if (mode == 's')
3549 { 3654 {
3550 SavedModes |= (priv_modes & bit); 3655 if (priv_modes & bit)
3656 SavedModes |= bit;
3657 else
3658 SavedModes &= ~bit;
3551 return -1; 3659 return -1;
3552 } 3660 }
3553 else 3661 else
3554 { 3662 {
3555 if (mode == 'r') 3663 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3664 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3665 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3666 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 set_privmode (bit, state); 3667
3668 if (state)
3669 priv_modes |= bit;
3670 else
3671 priv_modes &= ~bit;
3560 } 3672 }
3561 3673
3562 return state; 3674 return state;
3563} 3675}
3564 3676
3565/* we're not using priv _yet_ */ 3677/* we're not using priv _yet_ */
3566void 3678void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3679rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3680{
3569 unsigned int i, j; 3681 unsigned int i, j;
3570 int state; 3682 int state;
3571 3683
3572 static const struct 3684 static const struct
3573 { 3685 {
3574 const int argval; 3686 const int argval;
3575 const unsigned long bit; 3687 const unsigned long bit;
3576 } argtopriv[] = { 3688 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3689 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3690 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3691 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3692 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3693 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3694 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3695 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3696 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3697 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3698 // 18 end FF to printer after print screen
3699 // 19 Print screen prints full screen/scroll region
3587 { 25, PrivMode_VisibleCursor }, 3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3701#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3702 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3703#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3704 { 35, PrivMode_ShiftKeys }, // rxvt extension
3705 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3706 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3707 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3708 // 45 margin bell NYI
3595 // 46 start logging 3709 // 46 start logging
3596 { 47, PrivMode_Screen }, 3710 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3711 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3712#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3713 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3714#endif
3601 { 1000, PrivMode_MouseX11 }, 3715 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3716 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3717 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS
3719 { 1005, PrivMode_ExtModeMouse },
3720#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3722 { 1011, PrivMode_Keypress }, // rxvt extension
3723#if ENABLE_FRILLS
3724 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3725#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3726 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3727 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3728 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3729 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3730 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3731 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3732 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3613 { 2004, PrivMode_BracketPaste }, 3733 { 2004, PrivMode_BracketPaste },
3614 }; 3734 };
3615 3735
… …
3625 for (i = 0; i < nargs; i++) 3745 for (i = 0; i < nargs; i++)
3626 { 3746 {
3627 state = -1; 3747 state = -1;
3628 3748
3629 /* basic handling */ 3749 /* basic handling */
3630 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3750 for (j = 0; j < ecb_array_length (argtopriv); j++)
3631 if (argtopriv[j].argval == arg[i]) 3751 if (argtopriv[j].argval == arg[i])
3632 { 3752 {
3633 state = privcases (mode, argtopriv[j].bit); 3753 state = privcases (mode, argtopriv[j].bit);
3634 break; 3754 break;
3635 } 3755 }
… …
3643 3763
3644 scr_touch (true); 3764 scr_touch (true);
3645 break; 3765 break;
3646#endif 3766#endif
3647 case 1048: /* alternative cursor save */ 3767 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3769 if (mode == 0)
3651 scr_cursor (RESTORE); 3770 scr_cursor (RESTORE);
3652 else if (mode == 1) 3771 else if (mode == 1)
3653 scr_cursor (SAVE); 3772 scr_cursor (SAVE);
… …
3662 case 2: /* VT52 mode */ 3781 case 2: /* VT52 mode */
3663 /* oddball mode. should be set regardless of set/reset 3782 /* oddball mode. should be set regardless of set/reset
3664 * parameter. Return from VT52 mode with an ESC < from 3783 * parameter. Return from VT52 mode with an ESC < from
3665 * within VT52 mode 3784 * within VT52 mode
3666 */ 3785 */
3667 set_privmode (PrivMode_vt52, 1); 3786 priv_modes |= PrivMode_vt52;
3668 break; 3787 break;
3669 case 3: /* 80/132 */ 3788 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3789 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3790 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3791 break;
3676 case 4: /* smooth scrolling */ 3792 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3793 set_option (Opt_jumpScroll, !state);
3678 break; 3794 break;
3679 case 5: /* reverse video */ 3795 case 5: /* reverse video */
… …
3690 if (state) /* orthogonal */ 3806 if (state) /* orthogonal */
3691 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3807 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3692 break; 3808 break;
3693#ifdef scrollBar_esc 3809#ifdef scrollBar_esc
3694 case scrollBar_esc: 3810 case scrollBar_esc:
3695 if (scrollBar.map (state)) 3811 scrollBar.map (state);
3696 {
3697 resize_all_windows (0, 0, 0); 3812 resize_all_windows (0, 0, 0);
3698 scr_touch (true); 3813 scr_touch (true);
3699 }
3700 break; 3814 break;
3701#endif 3815#endif
3702 case 25: /* visible/invisible cursor */ 3816 case 25: /* visible/invisible cursor */
3703 scr_cursor_visible (state); 3817 scr_cursor_visible (state);
3704 break; 3818 break;
… …
3717 case 1003: 3831 case 1003:
3718 if (state) 3832 if (state)
3719 { 3833 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3834 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3835 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3836 mouse_row = mouse_col = 0;
3722 vt_emask_mouse = PointerMotionMask; 3837 vt_emask_mouse = PointerMotionMask;
3723 } 3838 }
3724 else 3839 else
3725 vt_emask_mouse = NoEventMask; 3840 vt_emask_mouse = NoEventMask;
3841
3726 vt_select_input (); 3842 vt_select_input ();
3727 break; 3843 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3844 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3845 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3846 break;
3731 case 1011: /* scroll to bottom on key press */ 3847 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3848 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3849 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3850 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3852 if (!state)
3737 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854
3738 scr_change_screen (state); 3855 scr_change_screen (state);
3739 break; 3856 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3857 case 1049: /* secondary screen w/ clearing first */
3858 if (option (Opt_secondaryScreen))
3859 if (state)
3860 scr_cursor (SAVE);
3861
3741 scr_change_screen (state); 3862 scr_change_screen (state);
3863
3742 if (option (Opt_secondaryScreen)) 3864 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3865 if (state)
3744 scr_erase_screen (2); 3866 scr_erase_screen (2);
3867 else
3868 scr_cursor (RESTORE);
3745 break; 3869 break;
3746 default: 3870 default:
3747 break; 3871 break;
3748 } 3872 }
3749 } 3873 }
3750} 3874}
3751/*}}} */ 3875/*}}} */
3752 3876
3753/*{{{ process sgr sequences */ 3877/*{{{ process sgr sequences */
3754void 3878void ecb_hot
3755rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3879rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3756{ 3880{
3757 unsigned int i; 3881 unsigned int i;
3758 short rendset; 3882 short rendset;
3759 int rendstyle; 3883 int rendstyle;
… …
3900 break; 4024 break;
3901#endif 4025#endif
3902 } 4026 }
3903 } 4027 }
3904} 4028}
3905/*}}} */
3906 4029
3907/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3908void 4030void
3909rxvt_term::process_graphics () 4031rxvt_term::set_cursor_style (int style)
3910{ 4032{
3911 unicode_t ch, cmd = cmd_getc (); 4033 if (!IN_RANGE_INC (style, 0, 4))
3912
3913 if (cmd == 'Q')
3914 {
3915 /* query graphics */
3916 tt_printf ("\033G0\012"); /* no graphics */
3917 return; 4034 return;
3918 } 4035
3919 /* swallow other graphics sequences until terminating ':' */ 4036 set_option (Opt_cursorUnderline, style >= 3);
3920 do 4037
3921 ch = cmd_getc (); 4038#ifdef CURSOR_BLINK
3922 while (ch != ':'); 4039 set_option (Opt_cursorBlink, !style || (style & 1));
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
3923} 4044}
3924/*}}} */ 4045/*}}} */
3925 4046
3926/* ------------------------------------------------------------------------- */ 4047/* ------------------------------------------------------------------------- */
3927 4048
… …
3943 4064
3944/* ---------------------------------------------------------------------- */ 4065/* ---------------------------------------------------------------------- */
3945/* Write data to the pty as typed by the user, pasted with the mouse, 4066/* Write data to the pty as typed by the user, pasted with the mouse,
3946 * or generated by us in response to a query ESC sequence. 4067 * or generated by us in response to a query ESC sequence.
3947 */ 4068 */
3948const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3949 4070
3950void 4071void
3951rxvt_term::tt_write (const char *data, unsigned int len) 4072rxvt_term::tt_write (const char *data, unsigned int len)
3952{ 4073{
3953 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3958 4079
3959 if (v_buflen == 0) 4080 if (v_buflen == 0)
3960 { 4081 {
3961 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4082 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3962 4083
4084 max_it (written, 0);
4085
3963 if ((unsigned int)written == len) 4086 if (written == len)
3964 return; 4087 return;
3965 4088
3966 data += written; 4089 data += written;
3967 len -= written; 4090 len -= written;
3968 } 4091 }
3969 4092
3970 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4093 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3971 4094
3972 memcpy (v_buffer + v_buflen, data, len); 4095 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len; 4096 v_buflen += len;
3974 4097
3975 pty_ev.set (ev::READ | ev::WRITE); 4098 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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