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.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC vs.
Revision 1.577 by root, Thu Jun 30 17:00:18 2016 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,2015 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 im_send_spot (); 1009 im_send_spot ();
993#endif 1010#endif
994 } 1011 }
995 1012
996 display->flush (); 1013 display->flush ();
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 (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1056{
1022 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1058 want_refresh = 1;
1024 refresh_check (); 1059 refresh_check ();
1057 1092
1058#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1059void 1094void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1096{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1063 { 1098 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1100 want_refresh = 1;
1066 refresh_check (); 1101 refresh_check ();
1067 } 1102 }
1072 1107
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1109void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1111{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1078 { 1113 {
1079 want_refresh = 1; 1114 want_refresh = 1;
1080 refresh_check (); 1115 refresh_check ();
1081 } 1116 }
1082 1117
1203 pty_write (); 1238 pty_write ();
1204 1239
1205 refresh_check (); 1240 refresh_check ();
1206} 1241}
1207 1242
1208void 1243void ecb_cold
1209rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1210{ 1245{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1247 recolor_cursor ();
1213 1248
1214#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1215 hidden_pointer = 0; 1250 hidden_pointer = 0;
1216 1251
1217 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1218 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1219#endif 1254#endif
1220} 1255}
1221 1256
1222#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1223void 1258void ecb_cold
1224rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1225{ 1260{
1226 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1227 return; 1262 return;
1228 1263
1230 XFlush (dpy); 1265 XFlush (dpy);
1231 1266
1232 hidden_pointer = 1; 1267 hidden_pointer = 1;
1233} 1268}
1234 1269
1235void 1270void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1272{
1238 make_current (); 1273 make_current ();
1239 1274
1240 pointer_blank (); 1275 pointer_blank ();
1332 32 + x, 1367 32 + x,
1333 32 + y); 1368 32 + y);
1334} 1369}
1335 1370
1336/*{{{ process an X event */ 1371/*{{{ process an X event */
1337void 1372void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1339{ 1374{
1340 make_current (); 1375 make_current ();
1341 1376
1342 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
1445 if (ev.xconfigure.window == parent) 1480 if (ev.xconfigure.window == parent)
1446 { 1481 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1483 ;
1449 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1453 { 1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1454 int x, y; 1499 int x, y;
1500
1455 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1456 { 1502 {
1457 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1459 } 1505 }
1460 else 1506 else
1461 get_window_origin (x, y); 1507 get_window_origin (x, y);
1462 1508
1463 if (bg_set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1514 moved = true;
1515 }
1466 } 1516 }
1467#endif
1468 1517
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1519 {
1471 seen_resize = 1; 1520 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1495 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1496 break; 1545 break;
1497 1546
1498 case MapNotify: 1547 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1553 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1514#endif 1558#endif
1515 mapped = 1; 1559 mapped = 1;
1516#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1561 text_blink_ev.start ();
1568 case MotionNotify: 1612 case MotionNotify:
1569#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1570 if (hidden_pointer) 1614 if (hidden_pointer)
1571 pointer_unblank (); 1615 pointer_unblank ();
1572#endif 1616#endif
1617 if (!bypass_keystate
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1575 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1622 break;
1578 1623
1579 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1591 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1592 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1593 &ev.xbutton.state); 1638 &ev.xbutton.state);
1594#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1595 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1596 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1597 { 1643 {
1598#endif
1599#if ISO_14755 1644#if ISO_14755
1600 // 5.4 1645 // 5.4
1601 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1602 { 1647 {
1603 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1609 1654
1610#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1658 {
1659 page_dirn scroll_selection_dir;
1614 int dist; 1660 int dist;
1615 1661
1616 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1618 */ 1664 */
1633 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1634 } 1680 }
1635 else 1681 else
1636 { 1682 {
1637 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1685 }
1640 1686
1641 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1689 + 1;
1644 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1646 } 1693 }
1647 else 1694 else
1648 { 1695 {
1649 /* we are within the text window, so we 1696 /* we are within the text window, so we
1650 * shouldn't be scrolling 1697 * shouldn't be scrolling
1651 */ 1698 */
1652 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1653 } 1700 }
1654#endif 1701#endif
1655#ifdef MOUSE_THRESHOLD
1656 } 1702 }
1657#endif
1658 } 1703 }
1659 } 1704 }
1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1706 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1675 } 1720 }
1676 break; 1721 break;
1677 } 1722 }
1678 1723
1679#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1689 }
1690#endif 1727#endif
1691 1728
1692#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1731 {
1705 1742
1706 refresh_check (); 1743 refresh_check ();
1707} 1744}
1708 1745
1709#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1710void 1747void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1712{ 1749{
1713 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1714 return; 1751 return;
1715 1752
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1754 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1756 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1721 } 1759 }
1722} 1760}
1723#endif 1761#endif
1724 1762
1725void 1763void ecb_cold
1726rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1727{ 1765{
1728 if (!focus) 1766 if (!focus)
1729 { 1767 {
1730 focus = 1; 1768 focus = 1;
1743#endif 1781#endif
1744#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1745 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1746 { 1784 {
1747 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1748 scr_recolour (); 1786 scr_recolor ();
1749 } 1787 }
1750#endif 1788#endif
1751#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1752 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1753 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1754#endif 1795#endif
1755 1796
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1798 }
1758} 1799}
1759 1800
1760void 1801void ecb_cold
1761rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1762{ 1803{
1763 if (focus) 1804 if (focus)
1764 { 1805 {
1765 focus = 0; 1806 focus = 0;
1766 want_refresh = 1; 1807 want_refresh = 1;
1767 1808
1768#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1769 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1770 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1771#endif 1815#endif
1772#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1773 if (iso14755buf) 1817 if (iso14755buf)
1774 { 1818 {
1775 iso14755buf = 0; 1819 iso14755buf = 0;
1790#endif 1834#endif
1791#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1793 { 1837 {
1794 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1795 scr_recolour (); 1839 scr_recolor ();
1796 } 1840 }
1797#endif 1841#endif
1798 1842
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1844 }
1801} 1845}
1802 1846
1803void 1847void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1805{ 1849{
1806#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1808 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1809 rgba c; 1856 rgba c;
1810 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1859 }
1813#endif 1860#endif
1814} 1861}
1815 1862
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1864void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1866{
1820 make_current (); 1867 make_current ();
1821 1868
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1871 return;
1825 1872
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1873 switch (ev.type)
1828 { 1874 {
1829 case PropertyNotify: 1875 case PropertyNotify:
1830 /* 1876 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1833 */ 1879 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1882 {
1837 bg_set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1838 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839 } 1891 }
1840 1892
1841 break; 1893 break;
1842 } 1894 }
1843# endif
1844 1895
1845 refresh_check (); 1896 refresh_check ();
1846} 1897}
1847#endif 1898#endif
1848 1899
1871 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1872 return; 1923 return;
1873 } 1924 }
1874#endif 1925#endif
1875 1926
1876 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1877 1928
1878 if (reportmode) 1929 if (reportmode)
1879 { 1930 {
1880 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1881 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
2131#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2132 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2133 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2134 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2135 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2136 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2137 { 2188 {
2138 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2139 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2140 mouse_report (ev); 2191 mouse_report (ev);
2141 } 2192 }
2161 case Button3: 2212 case Button3:
2162 selection_make (ev.time); 2213 selection_make (ev.time);
2163 break; 2214 break;
2164 2215
2165 case Button2: 2216 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2219 break;
2169 2220
2170#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2171 case Button4: 2222 case Button4:
2172 case Button5: 2223 case Button5:
2173 { 2224 {
2174 int i; 2225 int lines;
2175 page_dirn v; 2226 page_dirn dirn;
2176 2227
2177 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2178 2229
2179 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2180 i = 1; 2231 lines = 1;
2181 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2233 lines = nrow - 1;
2183 else 2234 else
2184 i = 5; 2235 lines = 5;
2185 2236
2186# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2187 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2188 { 2239 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2242
2193 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195 } 2245 }
2196 else 2246 else
2197# endif 2247# endif
2198 { 2248 {
2199 scr_page (v, i); 2249 scr_page (dirn, lines);
2200 scrollBar.show (1); 2250 scrollBar.show (1);
2201 } 2251 }
2202 } 2252 }
2203 break; 2253 break;
2204#endif 2254#endif
2206 } 2256 }
2207} 2257}
2208 2258
2209/*}}} */ 2259/*}}} */
2210 2260
2211void 2261void ecb_hot
2212rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2213{ 2263{
2214 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2216 2266
2335 } 2385 }
2336 } 2386 }
2337} 2387}
2338 2388
2339// read the next character 2389// read the next character
2340wchar_t 2390wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2342{ 2392{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2394 {
2345 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2357 } 2407 }
2358 2408
2359 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2360 { 2410 {
2361 mbstate.reset (); // reset now undefined conversion state 2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2415 }
2364 2416
2365 // assume wchar == unicode 2417 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2369 2421
2370 return NOCHAR; 2422 return NOCHAR;
2371} 2423}
2372 2424
2373// read the next octet 2425// read the next octet
2374uint32_t 2426uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2376{ 2428{
2377 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2431 : NOCHAR;
2380} 2432}
2381 2433
2382static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2383 2435
2384wchar_t 2436wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2438{
2387 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2388 2440
2389 if (c == NOCHAR) 2441 if (c == NOCHAR)
2390 throw out_of_input; 2442 throw out_of_input;
2391 2443
2392 return c; 2444 return c;
2393} 2445}
2394 2446
2395uint32_t 2447uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2449{
2398 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2399 2451
2400 if (c == NOCHAR) 2452 if (c == NOCHAR)
2404} 2456}
2405 2457
2406/*{{{ print pipe */ 2458/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2409FILE * 2461FILE * ecb_cold
2410rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2411{ 2463{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2465
2414 if (stream == NULL) 2466 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2468
2417 return stream; 2469 return stream;
2418} 2470}
2419 2471
2420int 2472int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2422{ 2474{
2423 fflush (stream); 2475 fflush (stream);
2424 return pclose (stream); 2476 return pclose (stream);
2425} 2477}
2426 2478
2427/* 2479/*
2428 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2429 */ 2481 */
2430void 2482void ecb_cold
2431rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2432{ 2484{
2433 FILE *fd = popen_printer (); 2485 FILE *fd = popen_printer ();
2434 2486
2435 if (!fd) 2487 if (!fd)
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2544};
2493 2545
2494/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2495void 2547void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2549{
2498 switch (ch) 2550 switch (ch)
2499 { 2551 {
2500 case C0_ESC: 2552 case C0_ESC:
2530 scr_charset_choose (0); 2582 scr_charset_choose (0);
2531 break; 2583 break;
2532 2584
2533#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2534 // 8-bit controls 2586 // 8-bit controls
2535 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2536 process_dcs_seq (); 2588 process_dcs_seq ();
2537 break; 2589 break;
2538 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2539 process_csi_seq (); 2591 process_csi_seq ();
2540 break; 2592 break;
2541 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2542 process_osc_seq (); 2594 process_osc_seq ();
2543 break; 2595 break;
2544#endif 2596#endif
2545 } 2597 }
2546} 2598}
2547/*}}} */ 2599/*}}} */
2548 2600
2549 2601
2550/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2551void 2603void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2605{
2554 int row, col; 2606 int row, col;
2555 2607
2556 switch (ch) 2608 switch (ch)
2606} 2658}
2607/*}}} */ 2659/*}}} */
2608 2660
2609 2661
2610/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2611void 2663void ecb_hot
2612rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2613{ 2665{
2614 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2615 2667
2616 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2823 };
2772 2824
2773void 2825void ecb_hot
2774rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2775{ 2827{
2776 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2777 unsigned int nargs, p; 2829 unsigned int nargs, p;
2778 int n, ndef; 2830 int n, ndef;
2779 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2780 2832
2781 nargs = 0; 2833 nargs = 0;
2787 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2788 priv = ch; 2840 priv = ch;
2789 ch = cmd_getc (); 2841 ch = cmd_getc ();
2790 } 2842 }
2791 2843
2844 prev_ch = 0;
2792 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2793 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2794 { 2847 {
2795 if (isdigit (ch)) 2848 if (isdigit (ch))
2796 { 2849 {
2806 n = -1; 2859 n = -1;
2807 } 2860 }
2808 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2809 process_nonprinting (ch); 2862 process_nonprinting (ch);
2810 2863
2864 prev_ch = ch;
2811 ch = cmd_getc (); 2865 ch = cmd_getc ();
2812 } 2866 }
2813 2867
2814 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2815 return; 2869 return;
2885 } 2939 }
2886 break; 2940 break;
2887#endif 2941#endif
2888 2942
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2950 break;
2897 2951
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3049 scr_insert_mode (1); 3103 scr_insert_mode (1);
3050 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3052 break; 3106 break;
3053 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3054 /* 3113 /*
3055 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3056 */ 3115 */
3057 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3058 if (nargs == 1) 3117 if (nargs == 1)
3132 break; 3191 break;
3133 3192
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3194 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3139 break; 3198 break;
3140 3199
3141 /* 3200 /*
3142 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3191rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3192{ 3251{
3193 unicode_t ch; 3252 unicode_t ch;
3194 bool seen_esc = false; 3253 bool seen_esc = false;
3195 unsigned int n = 0; 3254 unsigned int n = 0;
3196 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3197 3256
3198 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3199 { 3258 {
3200 if (seen_esc) 3259 if (seen_esc)
3201 { 3260 {
3216 else if (ch < 0x20) 3275 else if (ch < 0x20)
3217 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3218 3277
3219 seen_esc = false; 3278 seen_esc = false;
3220 3279
3221 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3222 // stop at some sane length 3281 // stop at some sane length
3223 return NULL; 3282 return NULL;
3224 3283
3225 string[n++] = ch; 3284 string[n++] = ch;
3226 } 3285 }
3275 free (s); 3334 free (s);
3276 } 3335 }
3277 } 3336 }
3278} 3337}
3279 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = {
3376 0, 0, 0,
3377 0, 0, +1,
3378 0, 0, -1,
3379 0, +1, 0,
3380 0, -1, 0,
3381 +1, 0, 0,
3382 -1, 0, 0,
3383 };
3384
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 {
3387 int r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3392 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3393 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3394
3395 unsigned int index = colorcube_index (r, g, b);
3396
3397 // minor issue: could update index 0 few more times
3398 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3399 {
3400 idx = index;
3401 goto update;
3402 }
3403
3404 if (rgb24_color[index] == color)
3405 return index + minTermCOLOR24;
3406
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3410 idx = index;
3411 }
3412
3413update:
3414 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence;
3416
3417 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3420 update_fade_color (idx, false);
3421
3422 return idx;
3423}
3424
3280void 3425void
3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3282{ 3427{
3283 if (str[0] == '?' && !str[1]) 3428 if (str[0] == '?' && !str[1])
3284 { 3429 {
3285 rgba c; 3430 rgba c;
3286 pix_colors_focused[color].get (c); 3431 pix_colors_focused[color].get (c);
3287 3432
3288#if XFT 3433#if XFT
3289 if (c.a != rgba::MAX_CC) 3434 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3291 else 3436 else
3292#endif 3437#endif
3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3294 } 3439 }
3295 else 3440 else
3343 &nitems, &bytes_after, &value) == Success 3488 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3489 && actual_type != None
3345 && actual_format == 8) 3490 && actual_format == 8)
3346 str = (const char *)(value); 3491 str = (const char *)(value);
3347 3492
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3493 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3349 3494
3350 XFree (value); 3495 XFree (value);
3351 } 3496 }
3352 else 3497 else
3353 { 3498 {
3421 break; 3566 break;
3422#endif 3567#endif
3423 case URxvt_Color_border: 3568 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3569 process_color_seq (op, Color_border, str, resp);
3425 break; 3570 break;
3426#if ENABLE_TRANSPARENCY 3571
3572#if BG_IMAGE_FROM_ROOT
3427 case URxvt_Color_tint: 3573 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp); 3574 process_color_seq (op, Color_tint, str, resp);
3429 { 3575 {
3430 bool changed = false; 3576 bool changed = false;
3431 3577
3432 if (ISSET_PIXCOLOR (Color_tint)) 3578 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3579 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434 3580
3435 if (changed) 3581 if (changed)
3436 update_background (); 3582 update_background ();
3437 } 3583 }
3438 3584
3442#if BG_IMAGE_FROM_FILE 3588#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap: 3589 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?")) 3590 if (!strcmp (str, "?"))
3445 { 3591 {
3446 char str[256]; 3592 char str[256];
3593 int h_scale = fimage.h_scale;
3594 int v_scale = fimage.v_scale;
3595 int h_align = fimage.h_align;
3596 int v_align = fimage.v_align;
3447 3597
3448 sprintf (str, "[%dx%d+%d+%d]", 3598 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767), 3599 h_scale, v_scale,
3450 min (h_align, 32767), min (v_align, 32767)); 3600 h_align, v_align);
3451 process_xterm_seq (XTerm_title, str, CHAR_ST); 3601 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 } 3602 }
3453 else 3603 else
3454 { 3604 {
3455 bool changed = false; 3605 bool changed = false;
3456 3606
3457 if (*str != ';') 3607 if (*str != ';')
3458 { 3608 {
3459 if (bg_set_file (str)) /* change pixmap */ 3609 try
3610 {
3611 fimage.set_file_geometry (this, str);
3460 changed = true; 3612 changed = true;
3613 }
3614 catch (const class rxvt_failure_exception &e)
3615 {
3616 }
3461 } 3617 }
3462 else 3618 else
3463 { 3619 {
3464 str++; 3620 str++;
3465 if (bg_set_geometry (str, true)) 3621 if (fimage.set_geometry (str, true))
3466 changed = true; 3622 changed = true;
3467 } 3623 }
3468 3624
3469 if (changed) 3625 if (changed)
3470 { 3626 {
3471 if (bg_window_position_sensitive ()) 3627 if (bg_window_position_sensitive ())
3472 { 3628 {
3473 int x, y; 3629 int x, y;
3474 get_window_origin (x, y); 3630 get_window_origin (x, y);
3475 bg_set_position (x, y); 3631 parent_x = x;
3632 parent_y = y;
3476 } 3633 }
3477 update_background (); 3634 update_background ();
3478 } 3635 }
3479 } 3636 }
3480 break; 3637 break;
3570 * 's' = save 3727 * 's' = save
3571 * 'r' = restore 3728 * 'r' = restore
3572 * 't' = toggle 3729 * 't' = toggle
3573 * so no need for fancy checking 3730 * so no need for fancy checking
3574 */ 3731 */
3575int 3732int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3733rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3734{
3578 int state; 3735 int state;
3579 3736
3580 if (mode == 's') 3737 if (mode == 's')
3581 { 3738 {
3582 SavedModes |= (priv_modes & bit); 3739 if (priv_modes & bit)
3740 SavedModes |= bit;
3741 else
3742 SavedModes &= ~bit;
3583 return -1; 3743 return -1;
3584 } 3744 }
3585 else 3745 else
3586 { 3746 {
3587 if (mode == 'r') 3747 if (mode == 'r')
3617 { 5, PrivMode_rVideo }, // DECSCNM 3777 { 5, PrivMode_rVideo }, // DECSCNM
3618 { 6, PrivMode_relOrigin }, // DECOM 3778 { 6, PrivMode_relOrigin }, // DECOM
3619 { 7, PrivMode_Autowrap }, // DECAWM 3779 { 7, PrivMode_Autowrap }, // DECAWM
3620 // 8, auto-repeat keys // DECARM 3780 // 8, auto-repeat keys // DECARM
3621 { 9, PrivMode_MouseX10 }, 3781 { 9, PrivMode_MouseX10 },
3782 { 12, PrivMode_BlinkingCursor },
3622 // 18 end FF to printer after print screen 3783 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region 3784 // 19 Print screen prints full screen/scroll region
3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3785 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3786#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3787 { scrollBar_esc, PrivMode_scrollBar },
3638#endif 3799#endif
3639 { 1000, PrivMode_MouseX11 }, 3800 { 1000, PrivMode_MouseX11 },
3640 { 1002, PrivMode_MouseBtnEvent }, 3801 { 1002, PrivMode_MouseBtnEvent },
3641 { 1003, PrivMode_MouseAnyEvent }, 3802 { 1003, PrivMode_MouseAnyEvent },
3642#if ENABLE_FRILLS 3803#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent },
3643 { 1005, PrivMode_ExtModeMouse }, 3805 { 1005, PrivMode_ExtModeMouse },
3644#endif 3806#endif
3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3646 { 1011, PrivMode_Keypress }, // rxvt extension 3808 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS 3809#if ENABLE_FRILLS
3735 scrollBar.map (state); 3897 scrollBar.map (state);
3736 resize_all_windows (0, 0, 0); 3898 resize_all_windows (0, 0, 0);
3737 scr_touch (true); 3899 scr_touch (true);
3738 break; 3900 break;
3739#endif 3901#endif
3902#ifdef CURSOR_BLINK
3903 case 12:
3904 cursor_blink_reset ();
3905 break;
3906#endif
3740 case 25: /* visible/invisible cursor */ 3907 case 25: /* visible/invisible cursor */
3741 scr_cursor_visible (state); 3908 scr_cursor_visible (state);
3742 break; 3909 break;
3743 /* case 35: - shift keys */ 3910 /* case 35: - shift keys */
3744 /* case 40: - 80 <--> 132 mode */ 3911 /* case 40: - 80 <--> 132 mode */
3797 } 3964 }
3798} 3965}
3799/*}}} */ 3966/*}}} */
3800 3967
3801/*{{{ process sgr sequences */ 3968/*{{{ process sgr sequences */
3802void 3969void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3970rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3971{
3805 unsigned int i; 3972 unsigned int i;
3806 short rendset; 3973 short rendset;
3807 int rendstyle; 3974 int rendstyle;
3849 //case 19: // ninth alt font 4016 //case 19: // ninth alt font
3850 //case 20: // gothic 4017 //case 20: // gothic
3851 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4018 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3852 rendset = 0, rendstyle = RS_Bold; 4019 rendset = 0, rendstyle = RS_Bold;
3853 break; 4020 break;
3854 case 22: // normal intensity 4021 case 22: // bold off (vt220)
3855 rendset = 0, rendstyle = RS_Bold; 4022 rendset = 0, rendstyle = RS_Bold;
3856 break; 4023 break;
3857 case 23: // disable italic 4024 case 23: // disable italic
3858 rendset = 0, rendstyle = RS_Italic; 4025 rendset = 0, rendstyle = RS_Italic;
3859 break; 4026 break;
3860 case 24: 4027 case 24: // underline off (vt220)
3861 rendset = 0, rendstyle = RS_Uline; 4028 rendset = 0, rendstyle = RS_Uline;
3862 break; 4029 break;
3863 case 25: 4030 case 25: // blink off (vt220)
3864 rendset = 0, rendstyle = RS_Blink; 4031 rendset = 0, rendstyle = RS_Blink;
3865 break; 4032 break;
3866 case 26: // variable spacing (iso 8613) 4033 case 26: // variable spacing (iso 8613)
3867 rendset = 0, rendstyle = RS_Blink; 4034 rendset = 0, rendstyle = RS_Blink;
3868 break; 4035 break;
3869 case 27: 4036 case 27: // reverse off (vt220)
3870 rendset = 0, rendstyle = RS_RVid; 4037 rendset = 0, rendstyle = RS_RVid;
3871 break; 4038 break;
3872 //case 28: // visible. NYI 4039 //case 28: // visible. NYI
3873 //case 29: // not crossed-out 4040 //case 29: // not crossed-out
3874 } 4041 }
3895 if (nargs > i + 2 && arg[i + 1] == 5) 4062 if (nargs > i + 2 && arg[i + 1] == 5)
3896 { 4063 {
3897 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3898 i += 2; 4065 i += 2;
3899 } 4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
3900 break; 4076 break;
3901 case 39: /* default fg */ 4077 case 39: /* default fg */
3902 scr_color (Color_fg, Color_fg); 4078 scr_color (Color_fg, Color_fg);
3903 break; 4079 break;
3904 4080
3915 case 48: // set bg color, ISO 8613-6 4091 case 48: // set bg color, ISO 8613-6
3916 if (nargs > i + 2 && arg[i + 1] == 5) 4092 if (nargs > i + 2 && arg[i + 1] == 5)
3917 { 4093 {
3918 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3919 i += 2; 4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
3920 } 4105 }
3921 break; 4106 break;
3922 case 49: /* default bg */ 4107 case 49: /* default bg */
3923 scr_color (Color_bg, Color_bg); 4108 scr_color (Color_bg, Color_bg);
3924 break; 4109 break;
3948 break; 4133 break;
3949#endif 4134#endif
3950 } 4135 }
3951 } 4136 }
3952} 4137}
4138
4139void
4140rxvt_term::set_cursor_style (int style)
4141{
4142 if (!IN_RANGE_INC (style, 0, 6))
4143 return;
4144
4145 if (style == 0)
4146 style = 1;
4147
4148 cursor_type = (style - 1) / 2;
4149 set_option (Opt_cursorUnderline, cursor_type == 1);
4150
4151#ifdef CURSOR_BLINK
4152 set_option (Opt_cursorBlink, style & 1);
4153 cursor_blink_reset ();
4154#endif
4155
4156 want_refresh = 1;
4157}
3953/*}}} */ 4158/*}}} */
3954 4159
3955/* ------------------------------------------------------------------------- */ 4160/* ---------------------------------------------------------------------- */
4161/* Write data to the pty as typed by the user, pasted with the mouse,
4162 * or generated by us in response to a query ESC sequence.
4163 */
3956 4164
3957/* 4165/*
3958 * Send printf () formatted output to the command. 4166 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4167 * Only use for small amounts of data.
3960 */ 4168 */
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4176 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4177 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4178 tt_write (buf, strlen (buf));
3971} 4179}
3972 4180
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4181/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4182void
3976 */ 4183rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4184{
4185 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4186 return;
4187
4188 if (option (Opt_scrollTtyKeypress))
4189 if (view_start)
4190 {
4191 view_start = 0;
4192 want_refresh = 1;
4193 }
4194
4195 tt_write_ (data, len);
4196}
3978 4197
3979void 4198void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4199rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4200{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4201 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4202 return;
3984 4203
4204 tt_write_ (data, len);
4205}
4206
4207static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4208
4209void
4210rxvt_term::tt_write_ (const char *data, unsigned int len)
4211{
3985 if (pty->pty < 0) 4212 if (pty->pty < 0)
3986 return; 4213 return;
3987 4214
3988 if (v_buflen == 0) 4215 if (v_buflen == 0)
3989 { 4216 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines