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.508 by sf-exg, Fri Apr 13 09:23:58 2012 UTC vs.
Revision 1.575 by root, Thu Jun 30 16:56:41 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
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 if (len > 0)
782 {
783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80;
801#endif
802 }
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /* escape prefix */
847 if (meta
848#ifdef META8_OPTION
849 && meta_char == C0_ESC
850#endif
851 )
852 {
853 const char ch = C0_ESC;
854 tt_write (&ch, 1);
855 }
856
857 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
858} 874}
859 875
860void 876void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
862{ 878{
863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
864 KeySym keysym; 880 KeySym keysym;
865 881
937void 953void
938rxvt_term::flush () 954rxvt_term::flush ()
939{ 955{
940 flush_ev.stop (); 956 flush_ev.stop ();
941 957
942#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
944 { 960 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 962 scr_touch (false);
947 } 963 }
987 while (row < end_row); 1003 while (row < end_row);
988 } 1004 }
989 1005
990 scr_refresh (); 1006 scr_refresh ();
991 scrollBar.show (1); 1007 scrollBar.show (1);
992#ifdef USE_XIM 1008#if USE_XIM
993 im_send_spot (); 1009 im_send_spot ();
994#endif 1010#endif
995 } 1011 }
996 1012
997 display->flush (); 1013 display->flush ();
1018 1034
1019#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1020void 1036void
1021rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1022{ 1038{
1039 if (!focus)
1040 return;
1041
1023 if (hidden_cursor) 1042 if (hidden_cursor)
1024 { 1043 {
1025 hidden_cursor = 0; 1044 hidden_cursor = 0;
1026 want_refresh = 1; 1045 want_refresh = 1;
1027 } 1046 }
1028 1047
1029 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1030 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1031 else 1050 else
1032 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1033} 1052}
1034 1053
1073 1092
1074#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1075void 1094void
1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077{ 1096{
1078 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1079 { 1098 {
1080 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081 want_refresh = 1; 1100 want_refresh = 1;
1082 refresh_check (); 1101 refresh_check ();
1083 } 1102 }
1088 1107
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1109void
1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1111{
1093 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1094 { 1113 {
1095 want_refresh = 1; 1114 want_refresh = 1;
1096 refresh_check (); 1115 refresh_check ();
1097 } 1116 }
1098 1117
1219 pty_write (); 1238 pty_write ();
1220 1239
1221 refresh_check (); 1240 refresh_check ();
1222} 1241}
1223 1242
1224void 1243void ecb_cold
1225rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1226{ 1245{
1227 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1228 recolour_cursor (); 1247 recolor_cursor ();
1229 1248
1230#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1231 hidden_pointer = 0; 1250 hidden_pointer = 0;
1232 1251
1233 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1234 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1235#endif 1254#endif
1236} 1255}
1237 1256
1238#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1239void 1258void ecb_cold
1240rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1241{ 1260{
1242 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1243 return; 1262 return;
1244 1263
1246 XFlush (dpy); 1265 XFlush (dpy);
1247 1266
1248 hidden_pointer = 1; 1267 hidden_pointer = 1;
1249} 1268}
1250 1269
1251void 1270void ecb_cold
1252rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1253{ 1272{
1254 make_current (); 1273 make_current ();
1255 1274
1256 pointer_blank (); 1275 pointer_blank ();
1348 32 + x, 1367 32 + x,
1349 32 + y); 1368 32 + y);
1350} 1369}
1351 1370
1352/*{{{ process an X event */ 1371/*{{{ process an X event */
1353void 1372void ecb_hot
1354rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1355{ 1374{
1356 make_current (); 1375 make_current ();
1357 1376
1358 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
1461 if (ev.xconfigure.window == parent) 1480 if (ev.xconfigure.window == parent)
1462 { 1481 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1483 ;
1465 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1469 { 1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1470 int x, y; 1499 int x, y;
1500
1471 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1472 { 1502 {
1473 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1475 } 1505 }
1476 else 1506 else
1477 get_window_origin (x, y); 1507 get_window_origin (x, y);
1478 1508
1479 if (bg_set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1480 || !(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));
1481 moved = true; 1514 moved = true;
1515 }
1482 } 1516 }
1483#endif
1484 1517
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1519 {
1487 seen_resize = 1; 1520 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1512 break; 1545 break;
1513 1546
1514 case MapNotify: 1547 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1516 /* 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
1517 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1519 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1520 * reparenting. 1553 // events at startup when the window manager reparents the
1521 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1523 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1530#endif 1558#endif
1531 mapped = 1; 1559 mapped = 1;
1532#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1533 text_blink_ev.start (); 1561 text_blink_ev.start ();
1584 case MotionNotify: 1612 case MotionNotify:
1585#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1614 if (hidden_pointer)
1587 pointer_unblank (); 1615 pointer_unblank ();
1588#endif 1616#endif
1617 if (!bypass_keystate
1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1591 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1593 break; 1622 break;
1594 1623
1595 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1607 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1638 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1611 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1613 { 1643 {
1614#endif
1615#if ISO_14755 1644#if ISO_14755
1616 // 5.4 1645 // 5.4
1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1618 { 1647 {
1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1625 1654
1626#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1627 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1628 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1629 { 1658 {
1659 page_dirn scroll_selection_dir;
1630 int dist; 1660 int dist;
1631 1661
1632 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1634 */ 1664 */
1657 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1658 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1; 1689 + 1;
1660 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1661 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1662 } 1693 }
1663 else 1694 else
1664 { 1695 {
1665 /* we are within the text window, so we 1696 /* we are within the text window, so we
1666 * shouldn't be scrolling 1697 * shouldn't be scrolling
1667 */ 1698 */
1668 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1669 } 1700 }
1670#endif 1701#endif
1671#ifdef MOUSE_THRESHOLD
1672 } 1702 }
1673#endif
1674 } 1703 }
1675 } 1704 }
1676 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)
1677 { 1706 {
1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1713 1742
1714 refresh_check (); 1743 refresh_check ();
1715} 1744}
1716 1745
1717#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1718void 1747void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1720{ 1749{
1721 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1722 return; 1751 return;
1723 1752
1729 XFree (h); 1758 XFree (h);
1730 } 1759 }
1731} 1760}
1732#endif 1761#endif
1733 1762
1734void 1763void ecb_cold
1735rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1736{ 1765{
1737 if (!focus) 1766 if (!focus)
1738 { 1767 {
1739 focus = 1; 1768 focus = 1;
1752#endif 1781#endif
1753#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1755 { 1784 {
1756 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1786 scr_recolor ();
1758 } 1787 }
1759#endif 1788#endif
1760#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1762 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1763#endif 1795#endif
1764 1796
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766 } 1798 }
1767} 1799}
1768 1800
1769void 1801void ecb_cold
1770rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1771{ 1803{
1772 if (focus) 1804 if (focus)
1773 { 1805 {
1774 focus = 0; 1806 focus = 0;
1775 want_refresh = 1; 1807 want_refresh = 1;
1776 1808
1777#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1778 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1779 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1780#endif 1815#endif
1781#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1782 if (iso14755buf) 1817 if (iso14755buf)
1783 { 1818 {
1784 iso14755buf = 0; 1819 iso14755buf = 0;
1799#endif 1834#endif
1800#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1801 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1802 { 1837 {
1803 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1804 scr_recolour (); 1839 scr_recolor ();
1805 } 1840 }
1806#endif 1841#endif
1807 1842
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1844 }
1810} 1845}
1811 1846
1812void 1847void ecb_cold
1813rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1814{ 1849{
1815#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1817 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1818 rgba c; 1856 rgba c;
1819 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1820 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);
1821 } 1859 }
1822#endif 1860#endif
1823} 1861}
1824 1862
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void 1864void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1866{
1829 make_current (); 1867 make_current ();
1830 1868
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1871 return;
1834 1872
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1873 switch (ev.type)
1837 { 1874 {
1838 case PropertyNotify: 1875 case PropertyNotify:
1839 /* 1876 /*
1840 * 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,
1841 * 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.
1842 */ 1879 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1882 {
1846 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);
1847 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848 } 1891 }
1849 1892
1850 break; 1893 break;
1851 } 1894 }
1852# endif
1853 1895
1854 refresh_check (); 1896 refresh_check ();
1855} 1897}
1856#endif 1898#endif
1857 1899
1880 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1881 return; 1923 return;
1882 } 1924 }
1883#endif 1925#endif
1884 1926
1885 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1886 1928
1887 if (reportmode) 1929 if (reportmode)
1888 { 1930 {
1889 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1890 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
2140#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2141 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2142 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2143 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2144 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2145 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2146 { 2188 {
2147 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2148 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2149 mouse_report (ev); 2191 mouse_report (ev);
2150 } 2192 }
2178 2220
2179#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2180 case Button4: 2222 case Button4:
2181 case Button5: 2223 case Button5:
2182 { 2224 {
2183 int i; 2225 int lines;
2184 page_dirn v; 2226 page_dirn dirn;
2185 2227
2186 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2187 2229
2188 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2189 i = 1; 2231 lines = 1;
2190 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2191 i = nrow - 1; 2233 lines = nrow - 1;
2192 else 2234 else
2193 i = 5; 2235 lines = 5;
2194 2236
2195# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2196 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2197 { 2239 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2242
2202 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204 } 2245 }
2205 else 2246 else
2206# endif 2247# endif
2207 { 2248 {
2208 scr_page (v, i); 2249 scr_page (dirn, lines);
2209 scrollBar.show (1); 2250 scrollBar.show (1);
2210 } 2251 }
2211 } 2252 }
2212 break; 2253 break;
2213#endif 2254#endif
2215 } 2256 }
2216} 2257}
2217 2258
2218/*}}} */ 2259/*}}} */
2219 2260
2220void 2261void ecb_hot
2221rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2222{ 2263{
2223 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2224 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2225 2266
2344 } 2385 }
2345 } 2386 }
2346} 2387}
2347 2388
2348// read the next character 2389// read the next character
2349wchar_t 2390wchar_t ecb_hot
2350rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2351{ 2392{
2352 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2353 { 2394 {
2354 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2366 } 2407 }
2367 2408
2368 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2369 { 2410 {
2370 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.
2371 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
2372 } 2415 }
2373 2416
2374 // assume wchar == unicode 2417 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2378 2421
2379 return NOCHAR; 2422 return NOCHAR;
2380} 2423}
2381 2424
2382// read the next octet 2425// read the next octet
2383uint32_t 2426uint32_t ecb_hot
2384rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2385{ 2428{
2386 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR; 2431 : NOCHAR;
2389} 2432}
2390 2433
2391static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2392 2435
2393wchar_t 2436wchar_t ecb_hot
2394rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2395{ 2438{
2396 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2397 2440
2398 if (c == NOCHAR) 2441 if (c == NOCHAR)
2399 throw out_of_input; 2442 throw out_of_input;
2400 2443
2401 return c; 2444 return c;
2402} 2445}
2403 2446
2404uint32_t 2447uint32_t ecb_hot
2405rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2406{ 2449{
2407 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2408 2451
2409 if (c == NOCHAR) 2452 if (c == NOCHAR)
2413} 2456}
2414 2457
2415/*{{{ print pipe */ 2458/*{{{ print pipe */
2416/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2417#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2418FILE * 2461FILE * ecb_cold
2419rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2420{ 2463{
2421 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");
2422 2465
2423 if (stream == NULL) 2466 if (stream == NULL)
2424 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2425 2468
2426 return stream; 2469 return stream;
2427} 2470}
2428 2471
2429int 2472int ecb_cold
2430rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2431{ 2474{
2432 fflush (stream); 2475 fflush (stream);
2433 return pclose (stream); 2476 return pclose (stream);
2434} 2477}
2435 2478
2436/* 2479/*
2437 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2438 */ 2481 */
2439void 2482void ecb_cold
2440rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2441{ 2484{
2442 FILE *fd = popen_printer (); 2485 FILE *fd = popen_printer ();
2443 2486
2444 if (!fd) 2487 if (!fd)
2499 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,
2500 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,
2501}; 2544};
2502 2545
2503/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2504void 2547void ecb_hot
2505rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2549{
2507 switch (ch) 2550 switch (ch)
2508 { 2551 {
2509 case C0_ESC: 2552 case C0_ESC:
2539 scr_charset_choose (0); 2582 scr_charset_choose (0);
2540 break; 2583 break;
2541 2584
2542#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2543 // 8-bit controls 2586 // 8-bit controls
2544 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2545 process_dcs_seq (); 2588 process_dcs_seq ();
2546 break; 2589 break;
2547 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2548 process_csi_seq (); 2591 process_csi_seq ();
2549 break; 2592 break;
2550 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2551 process_osc_seq (); 2594 process_osc_seq ();
2552 break; 2595 break;
2553#endif 2596#endif
2554 } 2597 }
2555} 2598}
2556/*}}} */ 2599/*}}} */
2557 2600
2558 2601
2559/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2560void 2603void ecb_cold
2561rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2562{ 2605{
2563 int row, col; 2606 int row, col;
2564 2607
2565 switch (ch) 2608 switch (ch)
2615} 2658}
2616/*}}} */ 2659/*}}} */
2617 2660
2618 2661
2619/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2620void 2663void ecb_hot
2621rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2622{ 2665{
2623 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2624 2667
2625 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
2777 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, */
2778 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, */
2779 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, {, |, }, ~, */
2780 }; 2823 };
2781 2824
2782void 2825void ecb_hot
2783rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2784{ 2827{
2785 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2786 unsigned int nargs, p; 2829 unsigned int nargs, p;
2787 int n, ndef; 2830 int n, ndef;
2788 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2789 2832
2790 nargs = 0; 2833 nargs = 0;
2796 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2797 priv = ch; 2840 priv = ch;
2798 ch = cmd_getc (); 2841 ch = cmd_getc ();
2799 } 2842 }
2800 2843
2844 prev_ch = 0;
2801 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2802 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2803 { 2847 {
2804 if (isdigit (ch)) 2848 if (isdigit (ch))
2805 { 2849 {
2815 n = -1; 2859 n = -1;
2816 } 2860 }
2817 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2818 process_nonprinting (ch); 2862 process_nonprinting (ch);
2819 2863
2864 prev_ch = ch;
2820 ch = cmd_getc (); 2865 ch = cmd_getc ();
2821 } 2866 }
2822 2867
2823 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2824 return; 2869 return;
3058 scr_insert_mode (1); 3103 scr_insert_mode (1);
3059 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3060 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3061 break; 3106 break;
3062 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3063 /* 3113 /*
3064 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3065 */ 3115 */
3066 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3067 if (nargs == 1) 3117 if (nargs == 1)
3200rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3201{ 3251{
3202 unicode_t ch; 3252 unicode_t ch;
3203 bool seen_esc = false; 3253 bool seen_esc = false;
3204 unsigned int n = 0; 3254 unsigned int n = 0;
3205 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3206 3256
3207 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3208 { 3258 {
3209 if (seen_esc) 3259 if (seen_esc)
3210 { 3260 {
3225 else if (ch < 0x20) 3275 else if (ch < 0x20)
3226 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3227 3277
3228 seen_esc = false; 3278 seen_esc = false;
3229 3279
3230 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3231 // stop at some sane length 3281 // stop at some sane length
3232 return NULL; 3282 return NULL;
3233 3283
3234 string[n++] = ch; 3284 string[n++] = ch;
3235 } 3285 }
3284 free (s); 3334 free (s);
3285 } 3335 }
3286 } 3336 }
3287} 3337}
3288 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 / (0xff / (Red_levels - 1));
3366 unsigned int idx_g = g / (0xff / (Green_levels - 1));
3367 unsigned int idx_b = b / (0xff / (Blue_levels - 1));
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))
3392 continue;
3393
3394 if (!IN_RANGE_EXC (g, 0, Green_levels))
3395 continue;
3396
3397 if (!IN_RANGE_EXC (b, 0, Blue_levels))
3398 continue;
3399
3400 unsigned int index = colorcube_index (r, g, b);
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 if (rgb24_color[index] == color)
3410 return index + minTermCOLOR24;
3411
3412 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3413 // but also handles wrap around values good enough
3414 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3415 idx = index;
3416 }
3417
3418update:
3419 rgb24_color[idx] = color;
3420 rgb24_seqno[idx] = ++rgb24_sequence;
3421
3422 idx += minTermCOLOR24;
3423 pix_colors_focused [idx].free (this);
3424 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3425 update_fade_color (idx, false);
3426
3427 return idx;
3428}
3429
3289void 3430void
3290rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3431rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3291{ 3432{
3292 if (str[0] == '?' && !str[1]) 3433 if (str[0] == '?' && !str[1])
3293 { 3434 {
3294 rgba c; 3435 rgba c;
3295 pix_colors_focused[color].get (c); 3436 pix_colors_focused[color].get (c);
3296 3437
3297#if XFT 3438#if XFT
3298 if (c.a != rgba::MAX_CC) 3439 if (c.a != rgba::MAX_CC)
3299 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3300 else 3441 else
3301#endif 3442#endif
3302 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3443 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3303 } 3444 }
3304 else 3445 else
3352 &nitems, &bytes_after, &value) == Success 3493 &nitems, &bytes_after, &value) == Success
3353 && actual_type != None 3494 && actual_type != None
3354 && actual_format == 8) 3495 && actual_format == 8)
3355 str = (const char *)(value); 3496 str = (const char *)(value);
3356 3497
3357 tt_printf ("\033]%d;%s%c", op, str, resp); 3498 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358 3499
3359 XFree (value); 3500 XFree (value);
3360 } 3501 }
3361 else 3502 else
3362 { 3503 {
3430 break; 3571 break;
3431#endif 3572#endif
3432 case URxvt_Color_border: 3573 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp); 3574 process_color_seq (op, Color_border, str, resp);
3434 break; 3575 break;
3435#if ENABLE_TRANSPARENCY 3576
3577#if BG_IMAGE_FROM_ROOT
3436 case URxvt_Color_tint: 3578 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp); 3579 process_color_seq (op, Color_tint, str, resp);
3438 { 3580 {
3439 bool changed = false; 3581 bool changed = false;
3440 3582
3441 if (ISSET_PIXCOLOR (Color_tint)) 3583 if (ISSET_PIXCOLOR (Color_tint))
3442 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3584 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443 3585
3444 if (changed) 3586 if (changed)
3445 update_background (); 3587 update_background ();
3446 } 3588 }
3447 3589
3451#if BG_IMAGE_FROM_FILE 3593#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3594 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3595 if (!strcmp (str, "?"))
3454 { 3596 {
3455 char str[256]; 3597 char str[256];
3598 int h_scale = fimage.h_scale;
3599 int v_scale = fimage.v_scale;
3600 int h_align = fimage.h_align;
3601 int v_align = fimage.v_align;
3456 3602
3457 sprintf (str, "[%dx%d+%d+%d]", 3603 sprintf (str, "[%dx%d+%d+%d]",
3458 min (h_scale, 32767), min (v_scale, 32767), 3604 h_scale, v_scale,
3459 min (h_align, 32767), min (v_align, 32767)); 3605 h_align, v_align);
3460 process_xterm_seq (XTerm_title, str, CHAR_ST); 3606 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3607 }
3462 else 3608 else
3463 { 3609 {
3464 bool changed = false; 3610 bool changed = false;
3465 3611
3466 if (*str != ';') 3612 if (*str != ';')
3467 { 3613 {
3468 if (bg_set_file (str)) /* change pixmap */ 3614 try
3615 {
3616 fimage.set_file_geometry (this, str);
3469 changed = true; 3617 changed = true;
3618 }
3619 catch (const class rxvt_failure_exception &e)
3620 {
3621 }
3470 } 3622 }
3471 else 3623 else
3472 { 3624 {
3473 str++; 3625 str++;
3474 if (bg_set_geometry (str, true)) 3626 if (fimage.set_geometry (str, true))
3475 changed = true; 3627 changed = true;
3476 } 3628 }
3477 3629
3478 if (changed) 3630 if (changed)
3479 { 3631 {
3480 if (bg_window_position_sensitive ()) 3632 if (bg_window_position_sensitive ())
3481 { 3633 {
3482 int x, y; 3634 int x, y;
3483 get_window_origin (x, y); 3635 get_window_origin (x, y);
3484 bg_set_position (x, y); 3636 parent_x = x;
3637 parent_y = y;
3485 } 3638 }
3486 update_background (); 3639 update_background ();
3487 } 3640 }
3488 } 3641 }
3489 break; 3642 break;
3579 * 's' = save 3732 * 's' = save
3580 * 'r' = restore 3733 * 'r' = restore
3581 * 't' = toggle 3734 * 't' = toggle
3582 * so no need for fancy checking 3735 * so no need for fancy checking
3583 */ 3736 */
3584int 3737int ecb_cold
3585rxvt_term::privcases (int mode, unsigned long bit) 3738rxvt_term::privcases (int mode, unsigned long bit)
3586{ 3739{
3587 int state; 3740 int state;
3588 3741
3589 if (mode == 's') 3742 if (mode == 's')
3629 { 5, PrivMode_rVideo }, // DECSCNM 3782 { 5, PrivMode_rVideo }, // DECSCNM
3630 { 6, PrivMode_relOrigin }, // DECOM 3783 { 6, PrivMode_relOrigin }, // DECOM
3631 { 7, PrivMode_Autowrap }, // DECAWM 3784 { 7, PrivMode_Autowrap }, // DECAWM
3632 // 8, auto-repeat keys // DECARM 3785 // 8, auto-repeat keys // DECARM
3633 { 9, PrivMode_MouseX10 }, 3786 { 9, PrivMode_MouseX10 },
3787 { 12, PrivMode_BlinkingCursor },
3634 // 18 end FF to printer after print screen 3788 // 18 end FF to printer after print screen
3635 // 19 Print screen prints full screen/scroll region 3789 // 19 Print screen prints full screen/scroll region
3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3790 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3637#ifdef scrollBar_esc 3791#ifdef scrollBar_esc
3638 { scrollBar_esc, PrivMode_scrollBar }, 3792 { scrollBar_esc, PrivMode_scrollBar },
3650#endif 3804#endif
3651 { 1000, PrivMode_MouseX11 }, 3805 { 1000, PrivMode_MouseX11 },
3652 { 1002, PrivMode_MouseBtnEvent }, 3806 { 1002, PrivMode_MouseBtnEvent },
3653 { 1003, PrivMode_MouseAnyEvent }, 3807 { 1003, PrivMode_MouseAnyEvent },
3654#if ENABLE_FRILLS 3808#if ENABLE_FRILLS
3809 { 1004, PrivMode_FocusEvent },
3655 { 1005, PrivMode_ExtModeMouse }, 3810 { 1005, PrivMode_ExtModeMouse },
3656#endif 3811#endif
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3812 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3813 { 1011, PrivMode_Keypress }, // rxvt extension
3659#if ENABLE_FRILLS 3814#if ENABLE_FRILLS
3747 scrollBar.map (state); 3902 scrollBar.map (state);
3748 resize_all_windows (0, 0, 0); 3903 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3904 scr_touch (true);
3750 break; 3905 break;
3751#endif 3906#endif
3907#ifdef CURSOR_BLINK
3908 case 12:
3909 cursor_blink_reset ();
3910 break;
3911#endif
3752 case 25: /* visible/invisible cursor */ 3912 case 25: /* visible/invisible cursor */
3753 scr_cursor_visible (state); 3913 scr_cursor_visible (state);
3754 break; 3914 break;
3755 /* case 35: - shift keys */ 3915 /* case 35: - shift keys */
3756 /* case 40: - 80 <--> 132 mode */ 3916 /* case 40: - 80 <--> 132 mode */
3809 } 3969 }
3810} 3970}
3811/*}}} */ 3971/*}}} */
3812 3972
3813/*{{{ process sgr sequences */ 3973/*{{{ process sgr sequences */
3814void 3974void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3975rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3976{
3817 unsigned int i; 3977 unsigned int i;
3818 short rendset; 3978 short rendset;
3819 int rendstyle; 3979 int rendstyle;
3861 //case 19: // ninth alt font 4021 //case 19: // ninth alt font
3862 //case 20: // gothic 4022 //case 20: // gothic
3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4023 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3864 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3865 break; 4025 break;
3866 case 22: // normal intensity 4026 case 22: // bold off (vt220)
3867 rendset = 0, rendstyle = RS_Bold; 4027 rendset = 0, rendstyle = RS_Bold;
3868 break; 4028 break;
3869 case 23: // disable italic 4029 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic; 4030 rendset = 0, rendstyle = RS_Italic;
3871 break; 4031 break;
3872 case 24: 4032 case 24: // underline off (vt220)
3873 rendset = 0, rendstyle = RS_Uline; 4033 rendset = 0, rendstyle = RS_Uline;
3874 break; 4034 break;
3875 case 25: 4035 case 25: // blink off (vt220)
3876 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3877 break; 4037 break;
3878 case 26: // variable spacing (iso 8613) 4038 case 26: // variable spacing (iso 8613)
3879 rendset = 0, rendstyle = RS_Blink; 4039 rendset = 0, rendstyle = RS_Blink;
3880 break; 4040 break;
3881 case 27: 4041 case 27: // reverse off (vt220)
3882 rendset = 0, rendstyle = RS_RVid; 4042 rendset = 0, rendstyle = RS_RVid;
3883 break; 4043 break;
3884 //case 28: // visible. NYI 4044 //case 28: // visible. NYI
3885 //case 29: // not crossed-out 4045 //case 29: // not crossed-out
3886 } 4046 }
3907 if (nargs > i + 2 && arg[i + 1] == 5) 4067 if (nargs > i + 2 && arg[i + 1] == 5)
3908 { 4068 {
3909 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4069 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3910 i += 2; 4070 i += 2;
3911 } 4071 }
4072 else if (nargs > i + 4 && arg[i + 1] == 2)
4073 {
4074 unsigned int r = arg[i + 2];
4075 unsigned int g = arg[i + 3];
4076 unsigned int b = arg[i + 4];
4077 unsigned int idx = map_rgb24_color (r, g, b);
4078 scr_color (idx, Color_fg);
4079 i += 4;
4080 }
3912 break; 4081 break;
3913 case 39: /* default fg */ 4082 case 39: /* default fg */
3914 scr_color (Color_fg, Color_fg); 4083 scr_color (Color_fg, Color_fg);
3915 break; 4084 break;
3916 4085
3927 case 48: // set bg color, ISO 8613-6 4096 case 48: // set bg color, ISO 8613-6
3928 if (nargs > i + 2 && arg[i + 1] == 5) 4097 if (nargs > i + 2 && arg[i + 1] == 5)
3929 { 4098 {
3930 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4099 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3931 i += 2; 4100 i += 2;
4101 }
4102 else if (nargs > i + 4 && arg[i + 1] == 2)
4103 {
4104 unsigned int r = arg[i + 2];
4105 unsigned int g = arg[i + 3];
4106 unsigned int b = arg[i + 4];
4107 unsigned int idx = map_rgb24_color (r, g, b);
4108 scr_color (idx, Color_bg);
4109 i += 4;
3932 } 4110 }
3933 break; 4111 break;
3934 case 49: /* default bg */ 4112 case 49: /* default bg */
3935 scr_color (Color_bg, Color_bg); 4113 scr_color (Color_bg, Color_bg);
3936 break; 4114 break;
3960 break; 4138 break;
3961#endif 4139#endif
3962 } 4140 }
3963 } 4141 }
3964} 4142}
4143
4144void
4145rxvt_term::set_cursor_style (int style)
4146{
4147 if (!IN_RANGE_INC (style, 0, 6))
4148 return;
4149
4150 if (style == 0)
4151 style = 1;
4152
4153 cursor_type = (style - 1) / 2;
4154 set_option (Opt_cursorUnderline, cursor_type == 1);
4155
4156#ifdef CURSOR_BLINK
4157 set_option (Opt_cursorBlink, style & 1);
4158 cursor_blink_reset ();
4159#endif
4160
4161 want_refresh = 1;
4162}
3965/*}}} */ 4163/*}}} */
3966 4164
3967/* ------------------------------------------------------------------------- */ 4165/* ---------------------------------------------------------------------- */
4166/* Write data to the pty as typed by the user, pasted with the mouse,
4167 * or generated by us in response to a query ESC sequence.
4168 */
3968 4169
3969/* 4170/*
3970 * Send printf () formatted output to the command. 4171 * Send printf () formatted output to the command.
3971 * Only use for small amounts of data. 4172 * Only use for small amounts of data.
3972 */ 4173 */
3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4181 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3981 va_end (arg_ptr); 4182 va_end (arg_ptr);
3982 tt_write (buf, strlen (buf)); 4183 tt_write (buf, strlen (buf));
3983} 4184}
3984 4185
3985/* ---------------------------------------------------------------------- */
3986/* Write data to the pty as typed by the user, pasted with the mouse, 4186/* Write data to the pty as typed by the user. */
3987 * or generated by us in response to a query ESC sequence. 4187void
3988 */ 4188rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4189{
4190 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4191 return;
4192
4193 if (option (Opt_scrollTtyKeypress))
4194 if (view_start)
4195 {
4196 view_start = 0;
4197 want_refresh = 1;
4198 }
4199
4200 tt_write_ (data, len);
4201}
3990 4202
3991void 4203void
3992rxvt_term::tt_write (const char *data, unsigned int len) 4204rxvt_term::tt_write (const char *data, unsigned int len)
3993{ 4205{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4206 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return; 4207 return;
3996 4208
4209 tt_write_ (data, len);
4210}
4211
4212static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4213
4214void
4215rxvt_term::tt_write_ (const char *data, unsigned int len)
4216{
3997 if (pty->pty < 0) 4217 if (pty->pty < 0)
3998 return; 4218 return;
3999 4219
4000 if (v_buflen == 0) 4220 if (v_buflen == 0)
4001 { 4221 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines