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.486 by sf-exg, Fri Apr 29 13:29:45 2011 UTC vs.
Revision 1.563 by root, Sat Dec 13 12:24:32 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-2011 Marc Lehmann <schmorp@schmorp.de> 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 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
325 }; 324 };
326 325
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 336# endif
338#endif 337#endif
339 return keysym; 338 return keysym;
340} 339}
341 340
342static inline int 341static inline int ecb_cold
343map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
344{ 343{
345 int param = 0; 344 int param = 0;
346 345
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 371 param = 3;
373 break; 372 break;
374 case XK_Select: 373 case XK_Select:
375 param = 4; 374 param = 4;
376 break; 375 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 376 case XK_Prior:
379 param = 5; 377 param = 5;
380 break; 378 break;
381 case XK_Next: 379 case XK_Next:
382 param = 6; 380 param = 6;
… …
385 param = 7; 383 param = 7;
386 break; 384 break;
387 case XK_End: 385 case XK_End:
388 param = 8; 386 param = 8;
389 break; 387 break;
390#endif
391 case XK_Help: 388 case XK_Help:
392 param = 28; 389 param = 28;
393 break; 390 break;
394 case XK_Menu: 391 case XK_Menu:
395 param = 29; 392 param = 29;
396 break; 393 break;
397 } 394 }
398 return param; 395 return param;
399} 396}
400 397
401void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
403{ 409{
404 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
405 KeySym keysym; 411 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
408 414
409#if ISO_14755 415#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
411 return; 417 return;
412#endif 418#endif
… …
421 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
423 429
424 kbuf[0] = 0; 430 kbuf[0] = 0;
425 431
426#ifdef USE_XIM 432#if USE_XIM
427 if (Input_Context) 433 if (Input_Context)
428 { 434 {
429 Status status_return; 435 Status status_return;
430 436
431#if 0 437#if 0
… …
469 } 475 }
470 } 476 }
471 else 477 else
472 len = 0; 478 len = 0;
473 } 479 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 480 }
478 else 481 else
479#endif 482#endif
480 { 483 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
483 } 488 {
489 KeySym orig_keysym = keysym;
484 490
485 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
486 { 704 {
487#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 707 return;
490#endif 708#endif
491 709
492 if (saveLines) 710 if (saveLines)
493 { 711 {
… …
506#endif 724#endif
507 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
508 726
509 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
510 { 728 {
511 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
512 return; 730 return;
513 } 731 }
514 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
515 { 733 {
516 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
517 return; 735 return;
518 } 736 }
519 } 737 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
522 { 740 {
523 if (keysym == XK_Up) 741 if (keysym == XK_Up)
524 { 742 {
525 scr_page (UP, 1); 743 scr_page (1);
526 return; 744 return;
527 } 745 }
528 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
529 { 747 {
530 scr_page (DN, 1); 748 scr_page (-1);
531 return; 749 return;
532 } 750 }
533 } 751 }
534#endif 752#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
537 { 755 {
538 if (keysym == XK_Home) 756 if (keysym == XK_Home)
539 { 757 {
540 scr_move_to (0, 1); 758 scr_changeview (top_row);
541 return; 759 return;
542 } 760 }
543 else if (keysym == XK_End) 761 else if (keysym == XK_End)
544 { 762 {
545 scr_move_to (1, 1); 763 scr_changeview (0);
546 return; 764 return;
547 } 765 }
548 } 766 }
549#endif 767#endif
550 } 768 }
551 769
552 if (shft) 770 if (shft)
553 { 771 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 773 {
562 switch (keysym) 774 switch (keysym)
563 { 775 {
564 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 785 return;
574#endif 786#endif
575 } 787 }
576 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
577 } 804 }
578 805
579#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 807 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 863 {
637 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
638 return; 865 return;
639 } 866 }
640#endif 867#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 /*
782 * Pass meta for all function keys, if 'meta' option set
783 */
784#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0)
786 kbuf[len - 1] |= 0x80;
787#endif
788
789 }
790 else if (ctrl && keysym == XK_minus)
791 {
792 len = 1;
793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
800 else
801 {
802#ifdef META8_OPTION
803 /* set 8-bit on */
804 if (meta && (meta_char == 0x80))
805 {
806 char *ch;
807
808 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80;
810
811 meta = 0;
812 }
813#endif
814 /* nil */ ;
815 }
816 } 868 }
817
818 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819 return;
820 869
821 if (len <= 0) 870 if (len <= 0)
822 return; /* not mapped */ 871 return; /* not mapped */
823 872
824 if (option (Opt_scrollTtyKeypress))
825 if (view_start)
826 {
827 view_start = 0;
828 want_refresh = 1;
829 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */
846 if (meta
847#ifdef META8_OPTION
848 && meta_char == C0_ESC
849#endif
850 )
851 {
852 const char ch = C0_ESC;
853 tt_write (&ch, 1);
854 }
855
856 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
857} 874}
858 875
859void 876void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
861{ 878{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 880 KeySym keysym;
864 881
… …
936void 953void
937rxvt_term::flush () 954rxvt_term::flush ()
938{ 955{
939 flush_ev.stop (); 956 flush_ev.stop ();
940 957
941#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
943 { 960 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 962 scr_touch (false);
946 } 963 }
… …
986 while (row < end_row); 1003 while (row < end_row);
987 } 1004 }
988 1005
989 scr_refresh (); 1006 scr_refresh ();
990 scrollBar.show (1); 1007 scrollBar.show (1);
991#ifdef USE_XIM 1008#if USE_XIM
992 IMSendSpot (); 1009 im_send_spot ();
993#endif 1010#endif
994 } 1011 }
995 1012
996 display->flush (); 1013 display->flush ();
997} 1014}
… …
1015 flush (); 1032 flush ();
1016} 1033}
1017 1034
1018#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1019void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1053{
1022 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1055 want_refresh = 1;
1024 refresh_check (); 1056 refresh_check ();
… …
1042 1074
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1076void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1078{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1081 {
1050 want_refresh = 1; 1082 want_refresh = 1;
1051 refresh_check (); 1083 refresh_check ();
1052 } 1084 }
1053 else 1085 else
… …
1057 1089
1058#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1059void 1091void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1093{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1063 { 1095 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1097 want_refresh = 1;
1066 refresh_check (); 1098 refresh_check ();
1067 } 1099 }
… …
1072 1104
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1106void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1108{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1078 { 1110 {
1079 want_refresh = 1; 1111 want_refresh = 1;
1080 refresh_check (); 1112 refresh_check ();
1081 } 1113 }
1082 1114
… …
1203 pty_write (); 1235 pty_write ();
1204 1236
1205 refresh_check (); 1237 refresh_check ();
1206} 1238}
1207 1239
1208void 1240void ecb_cold
1209rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1210{ 1242{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1244 recolor_cursor ();
1213 1245
1214#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1215 hidden_pointer = 0; 1247 hidden_pointer = 0;
1216 1248
1217 if (option (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1218 pointer_ev.start (pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1219#endif 1251#endif
1220} 1252}
1221 1253
1222#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1223void 1255void ecb_cold
1224rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1225{ 1257{
1226 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1227 return; 1259 return;
1228 1260
… …
1230 XFlush (dpy); 1262 XFlush (dpy);
1231 1263
1232 hidden_pointer = 1; 1264 hidden_pointer = 1;
1233} 1265}
1234 1266
1235void 1267void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1269{
1238 make_current (); 1270 make_current ();
1239 1271
1240 pointer_blank (); 1272 pointer_blank ();
… …
1332 32 + x, 1364 32 + x,
1333 32 + y); 1365 32 + y);
1334} 1366}
1335 1367
1336/*{{{ process an X event */ 1368/*{{{ process an X event */
1337void 1369void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1339{ 1371{
1340 make_current (); 1372 make_current ();
1341 1373
1342 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1477 if (ev.xconfigure.window == parent)
1446 { 1478 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1480 ;
1449 1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1486 if (bg_window_position_sensitive ())
1453 { 1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1454 int x, y; 1496 int x, y;
1497
1455 if (ev.xconfigure.send_event) 1498 if (ev.xconfigure.send_event)
1456 { 1499 {
1457 x = ev.xconfigure.x; 1500 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1501 y = ev.xconfigure.y;
1459 } 1502 }
1460 else 1503 else
1461 get_window_origin (x, y); 1504 get_window_origin (x, y);
1462 1505
1463 if (bg_set_position (x, y) 1506 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1511 moved = true;
1512 }
1466 } 1513 }
1467#endif
1468 1514
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1516 {
1471 seen_resize = 1; 1517 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473 } 1519 }
1474 else 1520 else
1475 { 1521 {
1476#ifdef HAVE_BG_PIXMAP 1522#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1523 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1524 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1525#endif
1485 } 1526 }
1486 1527
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1529 }
… …
1500 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1501 break; 1542 break;
1502 1543
1503 case MapNotify: 1544 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1545#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1546 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1547 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1548 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1549 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1550 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1551 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1552 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short 1553 if (bg_img == 0)
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1554 update_background_ev.start (0.025);
1519#endif 1555#endif
1520 mapped = 1; 1556 mapped = 1;
1521#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1558 text_blink_ev.start ();
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1599 ;
1564 1600
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1602 {
1567 scrollBar.state = STATE_IDLE; 1603 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1604 scrollBar.show (0);
1569 } 1605 }
1570 } 1606 }
1571 break; 1607 break;
1572 1608
… …
1614 1650
1615#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1654 {
1655 page_dirn scroll_selection_dir;
1619 int dist; 1656 int dist;
1620 1657
1621 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1623 */ 1660 */
… …
1638 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1639 } 1676 }
1640 else 1677 else
1641 { 1678 {
1642 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1681 }
1645 1682
1646 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1685 + 1;
1649 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1651 } 1689 }
1652 else 1690 else
1653 { 1691 {
1654 /* we are within the text window, so we 1692 /* we are within the text window, so we
1655 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1660#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1661 } 1699 }
1662#endif 1700#endif
1663 } 1701 }
1664 } 1702 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1704 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1669 ; 1707 ;
1670 1708
1671 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1713 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1715 scrollBar.size ());
1678 want_refresh = 1; 1716 want_refresh = 1;
1679 scrollBar.show (1); 1717 scrollBar.show (1);
1680 } 1718 }
1681 break; 1719 break;
1682 } 1720 }
1683 1721
1684#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1724 cursor_blink_reset ();
1694 }
1695#endif 1725#endif
1696 1726
1697#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1729 {
… …
1710 1740
1711 refresh_check (); 1741 refresh_check ();
1712} 1742}
1713 1743
1714#if ENABLE_FRILLS 1744#if ENABLE_FRILLS
1715void 1745void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1746rxvt_term::set_urgency (bool enable)
1717{ 1747{
1718 if (enable == urgency_hint) 1748 if (enable == urgency_hint)
1719 return; 1749 return;
1720 1750
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1752 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1754 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1755 urgency_hint = enable;
1756 XFree (h);
1726 } 1757 }
1727} 1758}
1728#endif 1759#endif
1729 1760
1730void 1761void ecb_cold
1731rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1732{ 1763{
1733 if (!focus) 1764 if (!focus)
1734 { 1765 {
1735 focus = 1; 1766 focus = 1;
1736 want_refresh = 1; 1767 want_refresh = 1;
1737 1768
1738#if USE_XIM 1769#if USE_XIM
1739 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1740 { 1771 {
1741 IMSetPosition (); 1772 im_set_position ();
1742 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1743 } 1774 }
1744#endif 1775#endif
1745#if CURSOR_BLINK 1776#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
… …
1748#endif 1779#endif
1749#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1750 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1751 { 1782 {
1752 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1753 scr_recolour (); 1784 scr_recolor ();
1754 } 1785 }
1755#endif 1786#endif
1756#if ENABLE_FRILLS 1787#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell)) 1788 if (option (Opt_urgentOnBell))
1758 set_urgency (0); 1789 set_urgency (0);
… …
1760 1791
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1793 }
1763} 1794}
1764 1795
1765void 1796void ecb_cold
1766rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1767{ 1798{
1768 if (focus) 1799 if (focus)
1769 { 1800 {
1770 focus = 0; 1801 focus = 0;
… …
1795#endif 1826#endif
1796#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1798 { 1829 {
1799 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1800 scr_recolour (); 1831 scr_recolor ();
1801 } 1832 }
1802#endif 1833#endif
1803 1834
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1836 }
1806} 1837}
1807 1838
1808void 1839void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1810{ 1841{
1811#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1813 { 1844 {
1845 if (!first_time)
1846 pix_colors_focused [idx].free (this);
1847
1814 rgba c; 1848 rgba c;
1815 pix_colors [Color_fade].get (c); 1849 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1850 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1851 }
1818#endif 1852#endif
1819} 1853}
1820 1854
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1855#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1856void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1857rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1858{
1825 make_current (); 1859 make_current ();
1826 1860
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1861 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1862 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1863 return;
1830 1864
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1865 switch (ev.type)
1833 { 1866 {
1834 case PropertyNotify: 1867 case PropertyNotify:
1835 /* 1868 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1869 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1870 * use the property to determine the pixmap. We use it later on.
1838 */ 1871 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1872 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1873 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1874 {
1842 bg_set_root_pixmap (); 1875#if BG_IMAGE_FROM_ROOT
1876 if (option (Opt_transparent))
1877 {
1878 rxvt_img::new_from_root (this)->replace (root_img);
1843 update_background (); 1879 update_background ();
1880 }
1881#endif
1882 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844 } 1883 }
1845 1884
1846 break; 1885 break;
1847 } 1886 }
1848# endif
1849 1887
1850 refresh_check (); 1888 refresh_check ();
1851} 1889}
1852#endif 1890#endif
1853 1891
… …
1876 iso14755_54 (ev.x, ev.y); 1914 iso14755_54 (ev.x, ev.y);
1877 return; 1915 return;
1878 } 1916 }
1879#endif 1917#endif
1880 1918
1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1919 clickintime = ev.time - MEvent.time < multiClickTime;
1882 1920
1883 if (reportmode) 1921 if (reportmode)
1884 { 1922 {
1885 /* mouse report from vt window */ 1923 /* mouse report from vt window */
1886 /* save the xbutton state (for ButtonRelease) */ 1924 /* save the xbutton state (for ButtonRelease) */
… …
1977 if (scrollBar.upButton (ev.y)) 2015 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 2016 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2017 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2018 direction = DN; /* down */
1981 2019
1982 scrollBar.state = STATE_IDLE; 2020 scrollBar.state = SB_STATE_IDLE;
1983 /* 2021 /*
1984 * Rxvt-style scrollbar: 2022 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2023 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2024 * move dn if mouse is below slider
1987 * 2025 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2064 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2065#endif
2028 if (scr_page (direction, 1)) 2066 if (scr_page (direction, 1))
2029 { 2067 {
2030 if (direction == UP) 2068 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2069 scrollBar.state = SB_STATE_UP;
2032 else 2070 else
2033 scrollBar.state = STATE_DOWN; 2071 scrollBar.state = SB_STATE_DOWN;
2034 } 2072 }
2035 } 2073 }
2036 else 2074 else
2037 switch (ev.button) 2075 switch (ev.button)
2038 { 2076 {
2039 case Button2: 2077 case Button2:
2040 switch (scrollBar.align) 2078 switch (scrollBar.align)
2041 { 2079 {
2042 case R_SB_ALIGN_TOP: 2080 case SB_ALIGN_TOP:
2043 csrO = 0; 2081 csrO = 0;
2044 break; 2082 break;
2045 case R_SB_ALIGN_CENTRE: 2083 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2084 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2085 break;
2048 case R_SB_ALIGN_BOTTOM: 2086 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2087 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2088 break;
2051 } 2089 }
2052 2090
2053 if (scrollBar.style == R_SB_XTERM 2091 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2092 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2093 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2094 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2095
2058 scrollBar.state = STATE_MOTION; 2096 scrollBar.state = SB_STATE_MOTION;
2059 break; 2097 break;
2060 2098
2061 case Button1: 2099 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2100 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2101 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2102 /* FALLTHROUGH */
2065 2103
2066 case Button3: 2104 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2105 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2106 {
2069 if (scrollbar_above_slider (ev.y)) 2107 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2108# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2109 scr_page (UP, nrow - 1);
2072# else 2110# else
2073 scr_page (UP, nrow / 4); 2111 scr_page (UP, nrow / 4);
2074# endif 2112# endif
2075 else if (scrollbar_below_slider (ev.y)) 2113 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2115 scr_page (DN, nrow - 1);
2078# else 2116# else
2079 scr_page (DN, nrow / 4); 2117 scr_page (DN, nrow / 4);
2080# endif 2118# endif
2081 else 2119 else
2082 scrollBar.state = STATE_MOTION; 2120 scrollBar.state = SB_STATE_MOTION;
2083 } 2121 }
2084 else 2122 else
2085 { 2123 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2124 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2125 (nrow
2088 * scrollbar_position (ev.y) 2126 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2127 / scrollBar.size ()));
2090 } 2128 }
2091 2129
2092 break; 2130 break;
2093 } 2131 }
… …
2104 2142
2105 csrO = 0; /* reset csr Offset */ 2143 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2144 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2145 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2146
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2147 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2148 {
2111 scrollBar.state = STATE_IDLE; 2149 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2150 scrollBar.show (0);
2113 } 2151 }
2114 2152
2115#ifdef SELECTION_SCROLLING 2153#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2154 sel_scroll_ev.stop();
… …
2136#ifdef MOUSE_REPORT_DOUBLECLICK 2174#ifdef MOUSE_REPORT_DOUBLECLICK
2137 /* only report the release of 'slow' single clicks */ 2175 /* only report the release of 'slow' single clicks */
2138 if (MEvent.button != AnyButton 2176 if (MEvent.button != AnyButton
2139 && (ev.button != MEvent.button 2177 && (ev.button != MEvent.button
2140 || (ev.time - MEvent.time 2178 || (ev.time - MEvent.time
2141 > MULTICLICK_TIME / 2))) 2179 > multiClickTime / 2)))
2142 { 2180 {
2143 MEvent.clicks = 0; 2181 MEvent.clicks = 0;
2144 MEvent.button = AnyButton; 2182 MEvent.button = AnyButton;
2145 mouse_report (ev); 2183 mouse_report (ev);
2146 } 2184 }
… …
2166 case Button3: 2204 case Button3:
2167 selection_make (ev.time); 2205 selection_make (ev.time);
2168 break; 2206 break;
2169 2207
2170 case Button2: 2208 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2209 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2210 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2211 break;
2174 2212
2175#ifdef MOUSE_WHEEL 2213#ifdef MOUSE_WHEEL
2176 case Button4: 2214 case Button4:
2177 case Button5: 2215 case Button5:
2178 { 2216 {
2179 int i; 2217 int lines;
2180 page_dirn v; 2218 page_dirn dirn;
2181 2219
2182 v = ev.button == Button4 ? UP : DN; 2220 dirn = ev.button == Button4 ? UP : DN;
2183 2221
2184 if (ev.state & ShiftMask) 2222 if (ev.state & ShiftMask)
2185 i = 1; 2223 lines = 1;
2186 else if (option (Opt_mouseWheelScrollPage)) 2224 else if (option (Opt_mouseWheelScrollPage))
2187 i = nrow - 1; 2225 lines = nrow - 1;
2188 else 2226 else
2189 i = 5; 2227 lines = 5;
2190 2228
2191# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2192 if (ev.state & ControlMask) 2230 if (ev.state & ControlMask)
2193 { 2231 {
2194 mouse_slip_wheel_speed += v ? -1 : 1; 2232 mouse_slip_wheel_speed += dirn;
2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2233 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197 2234
2198 if (!slip_wheel_ev.is_active ()) 2235 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2236 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200 } 2237 }
2201 else 2238 else
2202# endif 2239# endif
2203 { 2240 {
2204 scr_page (v, i); 2241 scr_page (dirn, lines);
2205 scrollBar.show (1); 2242 scrollBar.show (1);
2206 } 2243 }
2207 } 2244 }
2208 break; 2245 break;
2209#endif 2246#endif
… …
2211 } 2248 }
2212} 2249}
2213 2250
2214/*}}} */ 2251/*}}} */
2215 2252
2216void 2253void ecb_hot
2217rxvt_term::cmd_parse () 2254rxvt_term::cmd_parse ()
2218{ 2255{
2219 wchar_t ch = NOCHAR; 2256 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2257 char *seq_begin; // remember start of esc-sequence here
2221 2258
2222 for (;;) 2259 for (;;)
2223 { 2260 {
2224 if (expect_false (ch == NOCHAR)) 2261 if (ecb_unlikely (ch == NOCHAR))
2225 { 2262 {
2226 seq_begin = cmdbuf_ptr; 2263 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2264 ch = next_char ();
2228 2265
2229 if (ch == NOCHAR) 2266 if (ch == NOCHAR)
2230 break; 2267 break;
2231 } 2268 }
2232 2269
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2270 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2271 {
2235 if (expect_false (!seen_input)) 2272 if (ecb_unlikely (!seen_input))
2236 { 2273 {
2237 seen_input = 1; 2274 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2275 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2276 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2277 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2290 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2291 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2292
2256 for (;;) 2293 for (;;)
2257 { 2294 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2295 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2296 break;
2260 2297
2261 *str++ = ch; 2298 *str++ = ch;
2262 2299
2263 if (expect_false (ch == C0_LF || str >= eol)) 2300 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2301 {
2265 if (ch == C0_LF) 2302 if (ch == C0_LF)
2266 nlines++; 2303 nlines++;
2267 2304
2268 refresh_count++; 2305 refresh_count++;
… …
2340 } 2377 }
2341 } 2378 }
2342} 2379}
2343 2380
2344// read the next character 2381// read the next character
2345wchar_t 2382wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2383rxvt_term::next_char () NOTHROW
2347{ 2384{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2385 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2386 {
2350 // assume 7-bit to be ascii ALWAYS 2387 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2388 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2389 return *cmdbuf_ptr++;
2353 2390
2354 wchar_t wc; 2391 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2392 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2393
… …
2362 } 2399 }
2363 2400
2364 if (len == (size_t)-1) 2401 if (len == (size_t)-1)
2365 { 2402 {
2366 mbstate.reset (); // reset now undefined conversion state 2403 mbstate.reset (); // reset now undefined conversion state
2404 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2405 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2406 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2407 }
2369 2408
2370 // assume wchar == unicode 2409 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2410 cmdbuf_ptr += len;
… …
2374 2413
2375 return NOCHAR; 2414 return NOCHAR;
2376} 2415}
2377 2416
2378// read the next octet 2417// read the next octet
2379uint32_t 2418uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2419rxvt_term::next_octet () NOTHROW
2381{ 2420{
2382 return cmdbuf_ptr < cmdbuf_endp 2421 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2422 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2423 : NOCHAR;
2385} 2424}
2386 2425
2387static class out_of_input out_of_input; 2426static class out_of_input out_of_input;
2388 2427
2389wchar_t 2428wchar_t ecb_hot
2390rxvt_term::cmd_getc () THROW ((class out_of_input)) 2429rxvt_term::cmd_getc () THROW ((class out_of_input))
2391{ 2430{
2392 wchar_t c = next_char (); 2431 wchar_t c = next_char ();
2393 2432
2394 if (c == NOCHAR) 2433 if (c == NOCHAR)
2395 throw out_of_input; 2434 throw out_of_input;
2396 2435
2397 return c; 2436 return c;
2398} 2437}
2399 2438
2400uint32_t 2439uint32_t ecb_hot
2401rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2440rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402{ 2441{
2403 uint32_t c = next_octet (); 2442 uint32_t c = next_octet ();
2404 2443
2405 if (c == NOCHAR) 2444 if (c == NOCHAR)
… …
2409} 2448}
2410 2449
2411/*{{{ print pipe */ 2450/*{{{ print pipe */
2412/*----------------------------------------------------------------------*/ 2451/*----------------------------------------------------------------------*/
2413#ifdef PRINTPIPE 2452#ifdef PRINTPIPE
2414FILE * 2453FILE * ecb_cold
2415rxvt_term::popen_printer () 2454rxvt_term::popen_printer ()
2416{ 2455{
2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2456 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418 2457
2419 if (stream == NULL) 2458 if (stream == NULL)
2420 rxvt_warn ("can't open printer pipe, not printing.\n"); 2459 rxvt_warn ("can't open printer pipe, not printing.\n");
2421 2460
2422 return stream; 2461 return stream;
2423} 2462}
2424 2463
2425int 2464int ecb_cold
2426rxvt_term::pclose_printer (FILE *stream) 2465rxvt_term::pclose_printer (FILE *stream)
2427{ 2466{
2428 fflush (stream); 2467 fflush (stream);
2429 return pclose (stream); 2468 return pclose (stream);
2430} 2469}
2431 2470
2432/* 2471/*
2433 * simulate attached vt100 printer 2472 * simulate attached vt100 printer
2434 */ 2473 */
2435void 2474void ecb_cold
2436rxvt_term::process_print_pipe () 2475rxvt_term::process_print_pipe ()
2437{ 2476{
2438 FILE *fd = popen_printer (); 2477 FILE *fd = popen_printer ();
2439 2478
2440 if (!fd) 2479 if (!fd)
… …
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2534 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2535 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2536};
2498 2537
2499/*{{{ process non-printing single characters */ 2538/*{{{ process non-printing single characters */
2500void 2539void ecb_hot
2501rxvt_term::process_nonprinting (unicode_t ch) 2540rxvt_term::process_nonprinting (unicode_t ch)
2502{ 2541{
2503 switch (ch) 2542 switch (ch)
2504 { 2543 {
2505 case C0_ESC: 2544 case C0_ESC:
… …
2535 scr_charset_choose (0); 2574 scr_charset_choose (0);
2536 break; 2575 break;
2537 2576
2538#ifdef EIGHT_BIT_CONTROLS 2577#ifdef EIGHT_BIT_CONTROLS
2539 // 8-bit controls 2578 // 8-bit controls
2540 case 0x90: /* DCS */ 2579 case 0x90: /* DCS */
2541 process_dcs_seq (); 2580 process_dcs_seq ();
2542 break; 2581 break;
2543 case 0x9b: /* CSI */ 2582 case 0x9b: /* CSI */
2544 process_csi_seq (); 2583 process_csi_seq ();
2545 break; 2584 break;
2546 case 0x9d: /* OSC */ 2585 case 0x9d: /* OSC */
2547 process_osc_seq (); 2586 process_osc_seq ();
2548 break; 2587 break;
2549#endif 2588#endif
2550 } 2589 }
2551} 2590}
2552/*}}} */ 2591/*}}} */
2553 2592
2554 2593
2555/*{{{ process VT52 escape sequences */ 2594/*{{{ process VT52 escape sequences */
2556void 2595void ecb_cold
2557rxvt_term::process_escape_vt52 (unicode_t ch) 2596rxvt_term::process_escape_vt52 (unicode_t ch)
2558{ 2597{
2559 int row, col; 2598 int row, col;
2560 2599
2561 switch (ch) 2600 switch (ch)
… …
2595 break; 2634 break;
2596 case 'Z': /* identify the terminal type */ 2635 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2637 break;
2599 case '<': /* turn off VT52 mode */ 2638 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2639 priv_modes &= ~PrivMode_vt52;
2601 break; 2640 break;
2602 case 'F': /* use special graphics character set */ 2641 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2642 case 'G': /* use regular character set */
2604 /* unimplemented */ 2643 /* unimplemented */
2605 break; 2644 break;
… …
2611} 2650}
2612/*}}} */ 2651/*}}} */
2613 2652
2614 2653
2615/*{{{ process escape sequences */ 2654/*{{{ process escape sequences */
2616void 2655void ecb_hot
2617rxvt_term::process_escape_seq () 2656rxvt_term::process_escape_seq ()
2618{ 2657{
2619 unicode_t ch = cmd_getc (); 2658 unicode_t ch = cmd_getc ();
2620 2659
2621 if (priv_modes & PrivMode_vt52) 2660 if (priv_modes & PrivMode_vt52)
… …
2624 return; 2663 return;
2625 } 2664 }
2626 2665
2627 switch (ch) 2666 switch (ch)
2628 { 2667 {
2629 /* case 1: do_tek_mode (); break; */
2630 case '#': 2668 case '#':
2631 if (cmd_getc () == '8') 2669 if (cmd_getc () == '8')
2632 scr_E (); 2670 scr_E ();
2633 break; 2671 break;
2634 case '(': 2672 case '(':
… …
2657#if !ENABLE_MINIMAL 2695#if !ENABLE_MINIMAL
2658 case '9': 2696 case '9':
2659 scr_forwardindex (); 2697 scr_forwardindex ();
2660 break; 2698 break;
2661#endif 2699#endif
2700 // DECPAM/DECPNM
2662 case '=': 2701 case '=':
2702 priv_modes |= PrivMode_aplKP;
2703 break;
2663 case '>': 2704 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2705 priv_modes &= ~PrivMode_aplKP;
2665 break; 2706 break;
2666 2707
2667 case C1_40: 2708 case C1_40:
2668 cmd_getc (); 2709 cmd_getc ();
2669 break; 2710 break;
… …
2673 2714
2674 /* 8.3.87: NEXT LINE */ 2715 /* 8.3.87: NEXT LINE */
2675 case C1_NEL: /* ESC E */ 2716 case C1_NEL: /* ESC E */
2676 { 2717 {
2677 wchar_t nlcr[] = { C0_LF, C0_CR }; 2718 wchar_t nlcr[] = { C0_LF, C0_CR };
2678 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2719 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2679 } 2720 }
2680 break; 2721 break;
2681 2722
2682 /* kidnapped escape sequence: Should be 8.3.48 */ 2723 /* kidnapped escape sequence: Should be 8.3.48 */
2683 case C1_ESA: /* ESC G */ 2724 case C1_ESA: /* ESC G */
… …
2695 case C1_RI: /* ESC M */ 2736 case C1_RI: /* ESC M */
2696 scr_index (DN); 2737 scr_index (DN);
2697 break; 2738 break;
2698 2739
2699 /* 8.3.142: SINGLE-SHIFT TWO */ 2740 /* 8.3.142: SINGLE-SHIFT TWO */
2700 /*case C1_SS2: scr_single_shift (2); break; */ 2741 /* case C1_SS2: break; */
2701 2742
2702 /* 8.3.143: SINGLE-SHIFT THREE */ 2743 /* 8.3.143: SINGLE-SHIFT THREE */
2703 /*case C1_SS3: scr_single_shift (3); break; */ 2744 /* case C1_SS3: break; */
2704 2745
2705 /* 8.3.27: DEVICE CONTROL STRING */ 2746 /* 8.3.27: DEVICE CONTROL STRING */
2706 case C1_DCS: /* ESC P */ 2747 case C1_DCS: /* ESC P */
2707 process_dcs_seq (); 2748 process_dcs_seq ();
2708 break; 2749 break;
… …
2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2812 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2814 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2774 }; 2815 };
2775 2816
2776void 2817void ecb_hot
2777rxvt_term::process_csi_seq () 2818rxvt_term::process_csi_seq ()
2778{ 2819{
2779 unicode_t ch, priv, i; 2820 unicode_t ch, priv, prev_ch, i;
2780 unsigned int nargs, p; 2821 unsigned int nargs, p;
2781 int n, ndef; 2822 int n, ndef;
2782 int arg[ESC_ARGS] = { }; 2823 int arg[ESC_ARGS] = { };
2783 2824
2784 nargs = 0; 2825 nargs = 0;
… …
2790 /* '<' '=' '>' '?' '!' */ 2831 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2832 priv = ch;
2792 ch = cmd_getc (); 2833 ch = cmd_getc ();
2793 } 2834 }
2794 2835
2836 prev_ch = 0;
2795 /* read any numerical arguments */ 2837 /* read any numerical arguments */
2796 for (n = -1; ch < CSI_ICH; ) 2838 for (n = -1; ch < CSI_ICH; )
2797 { 2839 {
2798 if (isdigit (ch)) 2840 if (isdigit (ch))
2799 { 2841 {
… …
2809 n = -1; 2851 n = -1;
2810 } 2852 }
2811 else if (IS_CONTROL (ch)) 2853 else if (IS_CONTROL (ch))
2812 process_nonprinting (ch); 2854 process_nonprinting (ch);
2813 2855
2856 prev_ch = ch;
2814 ch = cmd_getc (); 2857 ch = cmd_getc ();
2815 } 2858 }
2816 2859
2817 if (ch > CSI_7F) 2860 if (ch > CSI_7F)
2818 return; 2861 return;
… …
2859 scr_soft_reset (); 2902 scr_soft_reset ();
2860 2903
2861 static const int pm_h[] = { 7, 25 }; 2904 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2905 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863 2906
2864 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2907 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2908 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2866 } 2909 }
2867 break; 2910 break;
2868 } 2911 }
2869 2912
2870 return; 2913 return;
… …
2888 } 2931 }
2889 break; 2932 break;
2890#endif 2933#endif
2891 2934
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2935 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2936 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2938 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2939 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2940 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2941 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2942 break;
2900 2943
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2944 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2945 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3052 scr_insert_mode (1); 3095 scr_insert_mode (1);
3053 else if (arg[0] == 20) 3096 else if (arg[0] == 20)
3054 priv_modes |= PrivMode_LFNL; 3097 priv_modes |= PrivMode_LFNL;
3055 break; 3098 break;
3056 3099
3100 case CSI_71: // DECSCUSR: set cursor style
3101 if (prev_ch == ' ')
3102 set_cursor_style (arg[0]);
3103 break;
3104
3057 /* 3105 /*
3058 * PRIVATE USE beyond this point. All CSI_7? sequences here 3106 * PRIVATE USE beyond this point. All CSI_7? sequences here
3059 */ 3107 */
3060 case CSI_72: /* DECSTBM: set top and bottom margins */ 3108 case CSI_72: /* DECSTBM: set top and bottom margins */
3061 if (nargs == 1) 3109 if (nargs == 1)
… …
3135 break; 3183 break;
3136 3184
3137 //case 9: NYI, TODO, restore maximized window or maximize window 3185 //case 9: NYI, TODO, restore maximized window or maximize window
3138 default: 3186 default:
3139 if (args[0] >= 24) /* set height (chars) */ 3187 if (args[0] >= 24) /* set height (chars) */
3140 set_widthheight ((unsigned int)width, 3188 set_widthheight ((unsigned int)vt_width,
3141 (unsigned int) (args[1] * fheight)); 3189 (unsigned int) (args[1] * fheight));
3142 break; 3190 break;
3143 3191
3144 /* 3192 /*
3145 * reports - some output format copied from XTerm 3193 * reports - some output format copied from XTerm
… …
3194rxvt_term::get_to_st (unicode_t &ends_how) 3242rxvt_term::get_to_st (unicode_t &ends_how)
3195{ 3243{
3196 unicode_t ch; 3244 unicode_t ch;
3197 bool seen_esc = false; 3245 bool seen_esc = false;
3198 unsigned int n = 0; 3246 unsigned int n = 0;
3199 wchar_t string[STRING_MAX]; 3247 wchar_t string[CBUFSIZ];
3200 3248
3201 while ((ch = cmd_getc ()) != NOCHAR) 3249 while ((ch = cmd_getc ()) != NOCHAR)
3202 { 3250 {
3203 if (seen_esc) 3251 if (seen_esc)
3204 { 3252 {
… …
3219 else if (ch < 0x20) 3267 else if (ch < 0x20)
3220 return NULL; /* other control character - exit */ 3268 return NULL; /* other control character - exit */
3221 3269
3222 seen_esc = false; 3270 seen_esc = false;
3223 3271
3224 if (n >= STRING_MAX - 1) 3272 if (n >= sizeof (string) - 1)
3225 // stop at some sane length 3273 // stop at some sane length
3226 return NULL; 3274 return NULL;
3227 3275
3228 string[n++] = ch; 3276 string[n++] = ch;
3229 } 3277 }
… …
3346 &nitems, &bytes_after, &value) == Success 3394 &nitems, &bytes_after, &value) == Success
3347 && actual_type != None 3395 && actual_type != None
3348 && actual_format == 8) 3396 && actual_format == 8)
3349 str = (const char *)(value); 3397 str = (const char *)(value);
3350 3398
3351 tt_printf ("\033]%d;%s%c", op, str, resp); 3399 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3352 3400
3353 XFree (value); 3401 XFree (value);
3354 } 3402 }
3355 else 3403 else
3356 { 3404 {
… …
3424 break; 3472 break;
3425#endif 3473#endif
3426 case URxvt_Color_border: 3474 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp); 3475 process_color_seq (op, Color_border, str, resp);
3428 break; 3476 break;
3429#if ENABLE_TRANSPARENCY 3477
3478#if BG_IMAGE_FROM_ROOT
3430 case URxvt_Color_tint: 3479 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp); 3480 process_color_seq (op, Color_tint, str, resp);
3432 { 3481 {
3433 bool changed = false; 3482 bool changed = false;
3434 3483
3435 if (ISSET_PIXCOLOR (Color_tint)) 3484 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3485 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3437 3486
3438 if (changed) 3487 if (changed)
3439 update_background (); 3488 update_background ();
3440 } 3489 }
3441 3490
… …
3445#if BG_IMAGE_FROM_FILE 3494#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3495 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3496 if (!strcmp (str, "?"))
3448 { 3497 {
3449 char str[256]; 3498 char str[256];
3499 int h_scale = fimage.h_scale;
3500 int v_scale = fimage.v_scale;
3501 int h_align = fimage.h_align;
3502 int v_align = fimage.v_align;
3450 3503
3451 sprintf (str, "[%dx%d+%d+%d]", 3504 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767), 3505 h_scale, v_scale,
3453 min (h_align, 32767), min (v_align, 32767)); 3506 h_align, v_align);
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3507 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3508 }
3456 else 3509 else
3457 { 3510 {
3458 int changed = 0; 3511 bool changed = false;
3459 3512
3460 if (*str != ';') 3513 if (*str != ';')
3461 { 3514 {
3462 if (bg_set_file (str)) /* change pixmap */ 3515 try
3463 { 3516 {
3517 fimage.set_file_geometry (this, str);
3464 changed++; 3518 changed = true;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else 3519 }
3469 bg_set_geometry (str+1); 3520 catch (const class rxvt_failure_exception &e)
3521 {
3470 } 3522 }
3471 } 3523 }
3472 else 3524 else
3473 { 3525 {
3474 str++; 3526 str++;
3475 if (bg_set_geometry (str, true)) 3527 if (fimage.set_geometry (str, true))
3476 changed++; 3528 changed = true;
3477 } 3529 }
3478 3530
3479 if (changed) 3531 if (changed)
3480 { 3532 {
3481 if (bg_window_position_sensitive ()) 3533 if (bg_window_position_sensitive ())
3482 { 3534 {
3483 int x, y; 3535 int x, y;
3484 get_window_origin (x, y); 3536 get_window_origin (x, y);
3485 bg_set_position (x, y); 3537 parent_x = x;
3538 parent_y = y;
3486 } 3539 }
3487 update_background (); 3540 update_background ();
3488 } 3541 }
3489 } 3542 }
3490 break; 3543 break;
… …
3580 * 's' = save 3633 * 's' = save
3581 * 'r' = restore 3634 * 'r' = restore
3582 * 't' = toggle 3635 * 't' = toggle
3583 * so no need for fancy checking 3636 * so no need for fancy checking
3584 */ 3637 */
3585int 3638int ecb_cold
3586rxvt_term::privcases (int mode, unsigned long bit) 3639rxvt_term::privcases (int mode, unsigned long bit)
3587{ 3640{
3588 int state; 3641 int state;
3589 3642
3590 if (mode == 's') 3643 if (mode == 's')
3591 { 3644 {
3592 SavedModes |= (priv_modes & bit); 3645 if (priv_modes & bit)
3646 SavedModes |= bit;
3647 else
3648 SavedModes &= ~bit;
3593 return -1; 3649 return -1;
3594 } 3650 }
3595 else 3651 else
3596 { 3652 {
3597 if (mode == 'r') 3653 if (mode == 'r')
3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3654 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3599 else 3655 else
3600 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3656 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601 3657
3602 set_privmode (bit, state); 3658 if (state)
3659 priv_modes |= bit;
3660 else
3661 priv_modes &= ~bit;
3603 } 3662 }
3604 3663
3605 return state; 3664 return state;
3606} 3665}
3607 3666
3608/* we're not using priv _yet_ */ 3667/* we're not using priv _yet_ */
3609void 3668void
3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3669rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3611{ 3670{
3612 unsigned int i, j; 3671 unsigned int i, j;
3613 int state; 3672 int state;
3614 3673
3615 static const struct 3674 static const struct
3616 { 3675 {
3617 const int argval; 3676 const int argval;
3618 const unsigned long bit; 3677 const unsigned long bit;
3619 } argtopriv[] = { 3678 } argtopriv[] = {
3620 { 1, PrivMode_aplCUR }, // DECCKM 3679 { 1, PrivMode_aplCUR }, // DECCKM
3621 { 2, PrivMode_vt52 }, 3680 { 2, PrivMode_vt52 }, // DECANM
3622 { 3, PrivMode_132 }, // DECCOLM 3681 { 3, PrivMode_132 }, // DECCOLM
3623 { 4, PrivMode_smoothScroll }, // DECSCLM 3682 { 4, PrivMode_smoothScroll }, // DECSCLM
3624 { 5, PrivMode_rVideo }, // DECSCNM 3683 { 5, PrivMode_rVideo }, // DECSCNM
3625 { 6, PrivMode_relOrigin }, // DECOM 3684 { 6, PrivMode_relOrigin }, // DECOM
3626 { 7, PrivMode_Autowrap }, // DECAWM 3685 { 7, PrivMode_Autowrap }, // DECAWM
3627 // 8, auto-repeat keys // DECARM 3686 // 8, auto-repeat keys // DECARM
3628 { 9, PrivMode_MouseX10 }, 3687 { 9, PrivMode_MouseX10 },
3688 { 12, PrivMode_BlinkingCursor },
3629 // 18 end FF to printer after print screen 3689 // 18 end FF to printer after print screen
3630 // 19 Print screen prints full screen/scroll region 3690 // 19 Print screen prints full screen/scroll region
3631 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3691 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3632#ifdef scrollBar_esc 3692#ifdef scrollBar_esc
3633 { scrollBar_esc, PrivMode_scrollBar }, 3693 { scrollBar_esc, PrivMode_scrollBar },
3634#endif 3694#endif
3635 { 35, PrivMode_ShiftKeys }, // rxvt extension 3695 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK 3696 // 38, tektronix mode // DECTEK
3637 { 40, PrivMode_132OK }, 3697 { 40, PrivMode_132OK },
3638 // 41 xterm more fixes NYI 3698 // 41 xterm more fixes NYI
3639 // 45 margin bell NYI 3699 // 45 margin bell NYI
3640 // 46 start logging 3700 // 46 start logging
3641 { 47, PrivMode_Screen }, 3701 { 47, PrivMode_Screen },
3642 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3702 { 66, PrivMode_aplKP }, // DECNKM
3643#ifndef NO_BACKSPACE_KEY 3703#ifndef NO_BACKSPACE_KEY
3644 { 67, PrivMode_BackSpace }, // DECBKM 3704 { 67, PrivMode_BackSpace }, // DECBKM
3645#endif 3705#endif
3646 { 1000, PrivMode_MouseX11 }, 3706 { 1000, PrivMode_MouseX11 },
3647 { 1002, PrivMode_MouseBtnEvent }, 3707 { 1002, PrivMode_MouseBtnEvent },
… …
3676 for (i = 0; i < nargs; i++) 3736 for (i = 0; i < nargs; i++)
3677 { 3737 {
3678 state = -1; 3738 state = -1;
3679 3739
3680 /* basic handling */ 3740 /* basic handling */
3681 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3741 for (j = 0; j < ecb_array_length (argtopriv); j++)
3682 if (argtopriv[j].argval == arg[i]) 3742 if (argtopriv[j].argval == arg[i])
3683 { 3743 {
3684 state = privcases (mode, argtopriv[j].bit); 3744 state = privcases (mode, argtopriv[j].bit);
3685 break; 3745 break;
3686 } 3746 }
… …
3712 case 2: /* VT52 mode */ 3772 case 2: /* VT52 mode */
3713 /* oddball mode. should be set regardless of set/reset 3773 /* oddball mode. should be set regardless of set/reset
3714 * parameter. Return from VT52 mode with an ESC < from 3774 * parameter. Return from VT52 mode with an ESC < from
3715 * within VT52 mode 3775 * within VT52 mode
3716 */ 3776 */
3717 set_privmode (PrivMode_vt52, 1); 3777 priv_modes |= PrivMode_vt52;
3718 break; 3778 break;
3719 case 3: /* 80/132 */ 3779 case 3: /* 80/132 */
3720 if (priv_modes & PrivMode_132OK) 3780 if (priv_modes & PrivMode_132OK)
3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3781 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3722 break; 3782 break;
… …
3737 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3798 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3799 break;
3740#ifdef scrollBar_esc 3800#ifdef scrollBar_esc
3741 case scrollBar_esc: 3801 case scrollBar_esc:
3742 if (scrollBar.map (state)) 3802 scrollBar.map (state);
3743 {
3744 resize_all_windows (0, 0, 0); 3803 resize_all_windows (0, 0, 0);
3745 scr_touch (true); 3804 scr_touch (true);
3746 } 3805 break;
3806#endif
3807#ifdef CURSOR_BLINK
3808 case 12:
3809 cursor_blink_reset ();
3747 break; 3810 break;
3748#endif 3811#endif
3749 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3750 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3751 break; 3814 break;
… …
3806 } 3869 }
3807} 3870}
3808/*}}} */ 3871/*}}} */
3809 3872
3810/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3811void 3874void ecb_hot
3812rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3813{ 3876{
3814 unsigned int i; 3877 unsigned int i;
3815 short rendset; 3878 short rendset;
3816 int rendstyle; 3879 int rendstyle;
… …
3858 //case 19: // ninth alt font 3921 //case 19: // ninth alt font
3859 //case 20: // gothic 3922 //case 20: // gothic
3860 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3861 rendset = 0, rendstyle = RS_Bold; 3924 rendset = 0, rendstyle = RS_Bold;
3862 break; 3925 break;
3863 case 22: // normal intensity 3926 case 22: // bold off (vt220)
3864 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3865 break; 3928 break;
3866 case 23: // disable italic 3929 case 23: // disable italic
3867 rendset = 0, rendstyle = RS_Italic; 3930 rendset = 0, rendstyle = RS_Italic;
3868 break; 3931 break;
3869 case 24: 3932 case 24: // underline off (vt220)
3870 rendset = 0, rendstyle = RS_Uline; 3933 rendset = 0, rendstyle = RS_Uline;
3871 break; 3934 break;
3872 case 25: 3935 case 25: // blink off (vt220)
3873 rendset = 0, rendstyle = RS_Blink; 3936 rendset = 0, rendstyle = RS_Blink;
3874 break; 3937 break;
3875 case 26: // variable spacing (iso 8613) 3938 case 26: // variable spacing (iso 8613)
3876 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3877 break; 3940 break;
3878 case 27: 3941 case 27: // reverse off (vt220)
3879 rendset = 0, rendstyle = RS_RVid; 3942 rendset = 0, rendstyle = RS_RVid;
3880 break; 3943 break;
3881 //case 28: // visible. NYI 3944 //case 28: // visible. NYI
3882 //case 29: // not crossed-out 3945 //case 29: // not crossed-out
3883 } 3946 }
… …
3957 break; 4020 break;
3958#endif 4021#endif
3959 } 4022 }
3960 } 4023 }
3961} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 6))
4030 return;
4031
4032 if (style == 0)
4033 style = 1;
4034
4035 cursor_type = (style - 1) / 2;
4036 set_option (Opt_cursorUnderline, cursor_type == 1);
4037
4038#ifdef CURSOR_BLINK
4039 set_option (Opt_cursorBlink, style & 1);
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
4044}
3962/*}}} */ 4045/*}}} */
3963 4046
3964/* ------------------------------------------------------------------------- */ 4047/* ---------------------------------------------------------------------- */
4048/* Write data to the pty as typed by the user, pasted with the mouse,
4049 * or generated by us in response to a query ESC sequence.
4050 */
3965 4051
3966/* 4052/*
3967 * Send printf () formatted output to the command. 4053 * Send printf () formatted output to the command.
3968 * Only use for small amounts of data. 4054 * Only use for small amounts of data.
3969 */ 4055 */
… …
3977 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4063 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3978 va_end (arg_ptr); 4064 va_end (arg_ptr);
3979 tt_write (buf, strlen (buf)); 4065 tt_write (buf, strlen (buf));
3980} 4066}
3981 4067
3982/* ---------------------------------------------------------------------- */
3983/* Write data to the pty as typed by the user, pasted with the mouse, 4068/* Write data to the pty as typed by the user. */
3984 * or generated by us in response to a query ESC sequence. 4069void
3985 */ 4070rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4071{
4072 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4073 return;
4074
4075 if (option (Opt_scrollTtyKeypress))
4076 if (view_start)
4077 {
4078 view_start = 0;
4079 want_refresh = 1;
4080 }
4081
4082 tt_write_ (data, len);
4083}
3987 4084
3988void 4085void
3989rxvt_term::tt_write (const char *data, unsigned int len) 4086rxvt_term::tt_write (const char *data, unsigned int len)
3990{ 4087{
3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4088 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3992 return; 4089 return;
3993 4090
4091 tt_write_ (data, len);
4092}
4093
4094static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4095
4096void
4097rxvt_term::tt_write_ (const char *data, unsigned int len)
4098{
3994 if (pty->pty < 0) 4099 if (pty->pty < 0)
3995 return; 4100 return;
3996 4101
3997 if (v_buflen == 0) 4102 if (v_buflen == 0)
3998 { 4103 {

Diff Legend

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