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.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.552 by sf-exg, Fri Jul 25 17:03:38 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = 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
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
403{ 416{
404 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
405 KeySym keysym; 418 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 419 char rkbuf[KBUFSZ + 1];
420 char *kbuf = rkbuf + 1;
408 421
409#if ISO_14755 422#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 423 if (iso14755buf & ISO_14755_52)
411 return; 424 return;
412#endif 425#endif
… …
421 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
423 436
424 kbuf[0] = 0; 437 kbuf[0] = 0;
425 438
426#ifdef USE_XIM 439#if USE_XIM
427 if (Input_Context) 440 if (Input_Context)
428 { 441 {
429 Status status_return; 442 Status status_return;
430 443
431#if 0 444#if 0
… …
469 } 482 }
470 } 483 }
471 else 484 else
472 len = 0; 485 len = 0;
473 } 486 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 487 }
478 else 488 else
479#endif 489#endif
480 { 490 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 491 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 492 }
493
494 if (keysym != NoSymbol)
483 } 495 {
496 KeySym orig_keysym = keysym;
484 497
485 if (valid_keysym) 498 /* Shift + F1 - F10 generates F11 - F20 */
499 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
500 {
501 keysym += (XK_F11 - XK_F1);
502 shft = 0; /* turn off Shift */
503 }
504
505 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
506 {
507 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
508 unsigned int newlen = 1;
509
510 if (ev.state & ModNumLockMask)
511 kp = false;
512
513 keysym = translate_keypad (keysym, kp);
514
515 switch (keysym)
516 {
517#ifndef NO_BACKSPACE_KEY
518 case XK_BackSpace:
519 if (priv_modes & PrivMode_HaveBackSpace)
520 {
521 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
522 ^ !!ctrl) ? '\b' : '\177';
523 kbuf[1] = '\0';
524 }
525 else
526 strcpy (kbuf, rs[Rs_backspace_key]);
527 break;
528#endif
529#ifndef NO_DELETE_KEY
530 case XK_Delete:
531 strcpy (kbuf, rs[Rs_delete_key]);
532 break;
533#endif
534 case XK_Tab:
535 if (shft)
536 strcpy (kbuf, "\033[Z");
537 else
538 {
539#ifdef CTRL_TAB_MAKES_META
540 if (ctrl)
541 meta = 1;
542#endif
543#ifdef MOD4_TAB_MAKES_META
544 if (ev.state & Mod4Mask)
545 meta = 1;
546#endif
547 newlen = 0;
548 }
549 break;
550
551 case XK_Up: /* "\033[A" */
552 case XK_Down: /* "\033[B" */
553 case XK_Right: /* "\033[C" */
554 case XK_Left: /* "\033[D" */
555 strcpy (kbuf, "\033[Z");
556 kbuf[2] = "DACB"[keysym - XK_Left];
557 /* do Shift first */
558 if (shft)
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 else if (ctrl)
561 {
562 kbuf[1] = 'O';
563 kbuf[2] = "dacb"[keysym - XK_Left];
564 }
565 else if (priv_modes & PrivMode_aplCUR)
566 kbuf[1] = 'O';
567 break;
568
569 case XK_KP_Enter:
570 /* allow shift to override */
571 if (kp)
572 {
573 strcpy (kbuf, "\033OM");
574 break;
575 }
576
577 /* FALLTHROUGH */
578
579 case XK_Return:
580 if (priv_modes & PrivMode_LFNL)
581 {
582 kbuf[0] = '\015';
583 kbuf[1] = '\012';
584 kbuf[2] = '\0';
585 }
586 else
587 {
588 kbuf[0] = '\015';
589 kbuf[1] = '\0';
590 }
591 break;
592
593 case XK_KP_F1: /* "\033OP" */
594 case XK_KP_F2: /* "\033OQ" */
595 case XK_KP_F3: /* "\033OR" */
596 case XK_KP_F4: /* "\033OS" */
597 strcpy (kbuf, "\033OP");
598 kbuf[2] += (keysym - XK_KP_F1);
599 break;
600
601 case XK_KP_Multiply: /* "\033Oj" : "*" */
602 case XK_KP_Add: /* "\033Ok" : "+" */
603 case XK_KP_Separator: /* "\033Ol" : "," */
604 case XK_KP_Subtract: /* "\033Om" : "-" */
605 case XK_KP_Decimal: /* "\033On" : "." */
606 case XK_KP_Divide: /* "\033Oo" : "/" */
607 case XK_KP_0: /* "\033Op" : "0" */
608 case XK_KP_1: /* "\033Oq" : "1" */
609 case XK_KP_2: /* "\033Or" : "2" */
610 case XK_KP_3: /* "\033Os" : "3" */
611 case XK_KP_4: /* "\033Ot" : "4" */
612 case XK_KP_5: /* "\033Ou" : "5" */
613 case XK_KP_6: /* "\033Ov" : "6" */
614 case XK_KP_7: /* "\033Ow" : "7" */
615 case XK_KP_8: /* "\033Ox" : "8" */
616 case XK_KP_9: /* "\033Oy" : "9" */
617 /* allow shift to override */
618 if (kp)
619 {
620 strcpy (kbuf, "\033Oj");
621 kbuf[2] += (keysym - XK_KP_Multiply);
622 }
623 else
624 {
625 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
626 kbuf[1] = '\0';
627 }
628 break;
629
630 default:
631 {
632 int param = map_function_key (keysym);
633 if (param > 0)
634 sprintf (kbuf,"\033[%d~", param);
635 else
636 newlen = 0;
637 }
638 break;
639 }
640
641 if (newlen)
642 len = strlen (kbuf);
643
644 if (len > 0)
645 {
646 /*
647 * pass Shift/Control indicators for function keys ending with `~'
648 *
649 * eg,
650 * Prior = "ESC[5~"
651 * Shift+Prior = "ESC[5$"
652 * Ctrl+Prior = "ESC[5^"
653 * Ctrl+Shift+Prior = "ESC[5@"
654 */
655 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
656 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
657
658 /*
659 * Pass meta for all function keys, if 'meta' option set
660 */
661#ifdef META8_OPTION
662 if (meta && (meta_char == 0x80))
663 kbuf[len - 1] |= 0x80;
664#endif
665 }
666
667 }
668 else if (ctrl && keysym == XK_minus)
669 {
670 len = 1;
671 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
672 }
673 else if (keysym == XK_ISO_Left_Tab)
674 {
675 strcpy (kbuf, "\033[Z");
676 len = 3;
677 }
678 else
679 {
680#ifdef META8_OPTION
681 /* set 8-bit on */
682 if (meta && (meta_char == 0x80))
683 {
684 char *ch;
685
686 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80;
688
689 meta = 0;
690 }
691#endif
692 /* nil */ ;
693 }
694
695 keysym = orig_keysym;
696 }
697
698 /* escape prefix */
699 if (len && meta
700#ifdef META8_OPTION
701 && meta_char == C0_ESC
702#endif
703 )
704 {
705 *--kbuf = C0_ESC;
706 len++;
707 }
708
709 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
710 return;
711
712 if (keysym != NoSymbol)
486 { 713 {
487#ifdef KEYSYM_RESOURCE 714#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 715 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 716 return;
490#endif 717#endif
491 718
492 if (saveLines) 719 if (saveLines)
493 { 720 {
… …
506#endif 733#endif
507 max_it (lnsppg, 1); 734 max_it (lnsppg, 1);
508 735
509 if (keysym == XK_Prior) 736 if (keysym == XK_Prior)
510 { 737 {
511 scr_page (UP, lnsppg); 738 scr_page (lnsppg);
512 return; 739 return;
513 } 740 }
514 else if (keysym == XK_Next) 741 else if (keysym == XK_Next)
515 { 742 {
516 scr_page (DN, lnsppg); 743 scr_page (-lnsppg);
517 return; 744 return;
518 } 745 }
519 } 746 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 747#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 748 if (IS_SCROLL_MOD)
522 { 749 {
523 if (keysym == XK_Up) 750 if (keysym == XK_Up)
524 { 751 {
525 scr_page (UP, 1); 752 scr_page (1);
526 return; 753 return;
527 } 754 }
528 else if (keysym == XK_Down) 755 else if (keysym == XK_Down)
529 { 756 {
530 scr_page (DN, 1); 757 scr_page (-1);
531 return; 758 return;
532 } 759 }
533 } 760 }
534#endif 761#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 762#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 763 if (IS_SCROLL_MOD)
537 { 764 {
538 if (keysym == XK_Home) 765 if (keysym == XK_Home)
539 { 766 {
540 scr_move_to (0, 1); 767 scr_changeview (top_row);
541 return; 768 return;
542 } 769 }
543 else if (keysym == XK_End) 770 else if (keysym == XK_End)
544 { 771 {
545 scr_move_to (1, 1); 772 scr_changeview (0);
546 return; 773 return;
547 } 774 }
548 } 775 }
549#endif 776#endif
550 } 777 }
551 778
552 if (shft) 779 if (shft)
553 { 780 {
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)) 781 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 782 {
562 switch (keysym) 783 switch (keysym)
563 { 784 {
564 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 794 return;
574#endif 795#endif
575 } 796 }
576 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
577 } 813 }
578 814
579#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 816 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 872 {
637 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
638 return; 874 return;
639 } 875 }
640#endif 876#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 } 877 }
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 878
821 if (len <= 0) 879 if (len <= 0)
822 return; /* not mapped */ 880 return; /* not mapped */
823 881
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); 882 tt_write_user_input (kbuf, (unsigned int)len);
857} 883}
858 884
859void 885void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
861{ 887{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 889 KeySym keysym;
864 890
… …
936void 962void
937rxvt_term::flush () 963rxvt_term::flush ()
938{ 964{
939 flush_ev.stop (); 965 flush_ev.stop ();
940 966
941#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 968 if (bg_flags & BG_NEEDS_REFRESH)
943 { 969 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 970 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 971 scr_touch (false);
946 } 972 }
… …
986 while (row < end_row); 1012 while (row < end_row);
987 } 1013 }
988 1014
989 scr_refresh (); 1015 scr_refresh ();
990 scrollBar.show (1); 1016 scrollBar.show (1);
991#ifdef USE_XIM 1017#if USE_XIM
992 im_send_spot (); 1018 im_send_spot ();
993#endif 1019#endif
994 } 1020 }
995 1021
996 display->flush (); 1022 display->flush ();
… …
1015 flush (); 1041 flush ();
1016} 1042}
1017 1043
1018#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1019void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1062{
1022 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1064 want_refresh = 1;
1024 refresh_check (); 1065 refresh_check ();
… …
1042 1083
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1085void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1087{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1090 {
1050 want_refresh = 1; 1091 want_refresh = 1;
1051 refresh_check (); 1092 refresh_check ();
1052 } 1093 }
1053 else 1094 else
… …
1057 1098
1058#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1059void 1100void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1102{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1063 { 1104 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1106 want_refresh = 1;
1066 refresh_check (); 1107 refresh_check ();
1067 } 1108 }
… …
1072 1113
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1115void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1117{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1078 { 1119 {
1079 want_refresh = 1; 1120 want_refresh = 1;
1080 refresh_check (); 1121 refresh_check ();
1081 } 1122 }
1082 1123
… …
1203 pty_write (); 1244 pty_write ();
1204 1245
1205 refresh_check (); 1246 refresh_check ();
1206} 1247}
1207 1248
1208void 1249void ecb_cold
1209rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1210{ 1251{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1253 recolour_cursor ();
1213 1254
… …
1218 pointer_ev.start (pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1219#endif 1260#endif
1220} 1261}
1221 1262
1222#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1223void 1264void ecb_cold
1224rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1225{ 1266{
1226 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1227 return; 1268 return;
1228 1269
… …
1230 XFlush (dpy); 1271 XFlush (dpy);
1231 1272
1232 hidden_pointer = 1; 1273 hidden_pointer = 1;
1233} 1274}
1234 1275
1235void 1276void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1278{
1238 make_current (); 1279 make_current ();
1239 1280
1240 pointer_blank (); 1281 pointer_blank ();
… …
1332 32 + x, 1373 32 + x,
1333 32 + y); 1374 32 + y);
1334} 1375}
1335 1376
1336/*{{{ process an X event */ 1377/*{{{ process an X event */
1337void 1378void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1339{ 1380{
1340 make_current (); 1381 make_current ();
1341 1382
1342 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1486 if (ev.xconfigure.window == parent)
1446 { 1487 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1489 ;
1449 1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1494#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1495 if (bg_window_position_sensitive ())
1453 { 1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1454 int x, y; 1505 int x, y;
1506
1455 if (ev.xconfigure.send_event) 1507 if (ev.xconfigure.send_event)
1456 { 1508 {
1457 x = ev.xconfigure.x; 1509 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1510 y = ev.xconfigure.y;
1459 } 1511 }
1460 else 1512 else
1461 get_window_origin (x, y); 1513 get_window_origin (x, y);
1462 1514
1463 if (bg_set_position (x, y) 1515 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1520 moved = true;
1521 }
1466 } 1522 }
1467#endif
1468 1523
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1525 {
1471 seen_resize = 1; 1526 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1495 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1496 break; 1551 break;
1497 1552
1498 case MapNotify: 1553 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1559 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1560 // 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 1561 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1562 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); 1563 update_background_ev.start (0.025);
1514#endif 1564#endif
1515 mapped = 1; 1565 mapped = 1;
1516#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1608 ;
1559 1609
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1611 {
1562 scrollBar.state = STATE_IDLE; 1612 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1613 scrollBar.show (0);
1564 } 1614 }
1565 } 1615 }
1566 break; 1616 break;
1567 1617
… …
1609 1659
1610#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1663 {
1664 page_dirn scroll_selection_dir;
1614 int dist; 1665 int dist;
1615 1666
1616 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1618 */ 1669 */
… …
1633 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1634 } 1685 }
1635 else 1686 else
1636 { 1687 {
1637 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1690 }
1640 1691
1641 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1694 + 1;
1644 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1646 } 1698 }
1647 else 1699 else
1648 { 1700 {
1649 /* we are within the text window, so we 1701 /* we are within the text window, so we
1650 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1655#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1656 } 1708 }
1657#endif 1709#endif
1658 } 1710 }
1659 } 1711 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1713 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1664 ; 1716 ;
1665 1717
… …
1675 } 1727 }
1676 break; 1728 break;
1677 } 1729 }
1678 1730
1679#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 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 (); 1733 cursor_blink_reset ();
1689 }
1690#endif 1734#endif
1691 1735
1692#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1738 {
… …
1705 1749
1706 refresh_check (); 1750 refresh_check ();
1707} 1751}
1708 1752
1709#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1710void 1754void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1755rxvt_term::set_urgency (bool enable)
1712{ 1756{
1713 if (enable == urgency_hint) 1757 if (enable == urgency_hint)
1714 return; 1758 return;
1715 1759
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1761 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1763 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1764 urgency_hint = enable;
1765 XFree (h);
1721 } 1766 }
1722} 1767}
1723#endif 1768#endif
1724 1769
1725void 1770void ecb_cold
1726rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1727{ 1772{
1728 if (!focus) 1773 if (!focus)
1729 { 1774 {
1730 focus = 1; 1775 focus = 1;
… …
1755 1800
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1802 }
1758} 1803}
1759 1804
1760void 1805void ecb_cold
1761rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1762{ 1807{
1763 if (focus) 1808 if (focus)
1764 { 1809 {
1765 focus = 0; 1810 focus = 0;
… …
1798 1843
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1845 }
1801} 1846}
1802 1847
1803void 1848void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1805{ 1850{
1806#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1808 { 1853 {
… …
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1857 }
1813#endif 1858#endif
1814} 1859}
1815 1860
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1862void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1864{
1820 make_current (); 1865 make_current ();
1821 1866
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1869 return;
1825 1870
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1871 switch (ev.type)
1828 { 1872 {
1829 case PropertyNotify: 1873 case PropertyNotify:
1830 /* 1874 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1875 * 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. 1876 * use the property to determine the pixmap. We use it later on.
1833 */ 1877 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1880 {
1837 bg_set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1838 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839 } 1889 }
1840 1890
1841 break; 1891 break;
1842 } 1892 }
1843# endif
1844 1893
1845 refresh_check (); 1894 refresh_check ();
1846} 1895}
1847#endif 1896#endif
1848 1897
… …
1972 if (scrollBar.upButton (ev.y)) 2021 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2022 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2023 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2024 direction = DN; /* down */
1976 2025
1977 scrollBar.state = STATE_IDLE; 2026 scrollBar.state = SB_STATE_IDLE;
1978 /* 2027 /*
1979 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2029 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1982 * 2031 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2071#endif
2023 if (scr_page (direction, 1)) 2072 if (scr_page (direction, 1))
2024 { 2073 {
2025 if (direction == UP) 2074 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2075 scrollBar.state = SB_STATE_UP;
2027 else 2076 else
2028 scrollBar.state = STATE_DOWN; 2077 scrollBar.state = SB_STATE_DOWN;
2029 } 2078 }
2030 } 2079 }
2031 else 2080 else
2032 switch (ev.button) 2081 switch (ev.button)
2033 { 2082 {
2034 case Button2: 2083 case Button2:
2035 switch (scrollBar.align) 2084 switch (scrollBar.align)
2036 { 2085 {
2037 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2038 csrO = 0; 2087 csrO = 0;
2039 break; 2088 break;
2040 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2091 break;
2043 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2094 break;
2046 } 2095 }
2047 2096
2048 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2101
2053 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2054 break; 2103 break;
2055 2104
2056 case Button1: 2105 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2060 2109
2061 case Button3: 2110 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2112 {
2064 if (scrollBar.above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2067# else 2116# else
… …
2072 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2073# else 2122# else
2074 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2075# endif 2124# endif
2076 else 2125 else
2077 scrollBar.state = STATE_MOTION; 2126 scrollBar.state = SB_STATE_MOTION;
2078 } 2127 }
2079 else 2128 else
2080 { 2129 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2131 (nrow
… …
2099 2148
2100 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2150 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2152
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2154 {
2106 scrollBar.state = STATE_IDLE; 2155 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2156 scrollBar.show (0);
2108 } 2157 }
2109 2158
2110#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
… …
2161 case Button3: 2210 case Button3:
2162 selection_make (ev.time); 2211 selection_make (ev.time);
2163 break; 2212 break;
2164 2213
2165 case Button2: 2214 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 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); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2217 break;
2169 2218
2170#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2171 case Button4: 2220 case Button4:
2172 case Button5: 2221 case Button5:
2173 { 2222 {
2174 int i; 2223 int lines;
2175 page_dirn v; 2224 page_dirn dirn;
2176 2225
2177 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2178 2227
2179 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2180 i = 1; 2229 lines = 1;
2181 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2231 lines = nrow - 1;
2183 else 2232 else
2184 i = 5; 2233 lines = 5;
2185 2234
2186# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2187 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2188 { 2237 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2240
2193 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195 } 2243 }
2196 else 2244 else
2197# endif 2245# endif
2198 { 2246 {
2199 scr_page (v, i); 2247 scr_page (dirn, lines);
2200 scrollBar.show (1); 2248 scrollBar.show (1);
2201 } 2249 }
2202 } 2250 }
2203 break; 2251 break;
2204#endif 2252#endif
… …
2206 } 2254 }
2207} 2255}
2208 2256
2209/*}}} */ 2257/*}}} */
2210 2258
2211void 2259void ecb_hot
2212rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2213{ 2261{
2214 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2216 2264
… …
2335 } 2383 }
2336 } 2384 }
2337} 2385}
2338 2386
2339// read the next character 2387// read the next character
2340wchar_t 2388wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2342{ 2390{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2392 {
2345 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
… …
2357 } 2405 }
2358 2406
2359 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2360 { 2408 {
2361 mbstate.reset (); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // 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 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2413 }
2364 2414
2365 // assume wchar == unicode 2415 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2369 2419
2370 return NOCHAR; 2420 return NOCHAR;
2371} 2421}
2372 2422
2373// read the next octet 2423// read the next octet
2374uint32_t 2424uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2376{ 2426{
2377 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2429 : NOCHAR;
2380} 2430}
2381 2431
2382static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2383 2433
2384wchar_t 2434wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2436{
2387 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2388 2438
2389 if (c == NOCHAR) 2439 if (c == NOCHAR)
2390 throw out_of_input; 2440 throw out_of_input;
2391 2441
2392 return c; 2442 return c;
2393} 2443}
2394 2444
2395uint32_t 2445uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2447{
2398 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2399 2449
2400 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2404} 2454}
2405 2455
2406/*{{{ print pipe */ 2456/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2409FILE * 2459FILE * ecb_cold
2410rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2411{ 2461{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2463
2414 if (stream == NULL) 2464 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2466
2417 return stream; 2467 return stream;
2418} 2468}
2419 2469
2420int 2470int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2422{ 2472{
2423 fflush (stream); 2473 fflush (stream);
2424 return pclose (stream); 2474 return pclose (stream);
2425} 2475}
2426 2476
2427/* 2477/*
2428 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2429 */ 2479 */
2430void 2480void ecb_cold
2431rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2432{ 2482{
2433 FILE *fd = popen_printer (); 2483 FILE *fd = popen_printer ();
2434 2484
2435 if (!fd) 2485 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 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, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2542};
2493 2543
2494/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2495void 2545void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2547{
2498 switch (ch) 2548 switch (ch)
2499 { 2549 {
2500 case C0_ESC: 2550 case C0_ESC:
… …
2546} 2596}
2547/*}}} */ 2597/*}}} */
2548 2598
2549 2599
2550/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2551void 2601void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2603{
2554 int row, col; 2604 int row, col;
2555 2605
2556 switch (ch) 2606 switch (ch)
… …
2606} 2656}
2607/*}}} */ 2657/*}}} */
2608 2658
2609 2659
2610/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2611void 2661void ecb_hot
2612rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2613{ 2663{
2614 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2615 2665
2616 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 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, */ 2819 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, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2821 };
2772 2822
2773void 2823void ecb_hot
2774rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2775{ 2825{
2776 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2777 unsigned int nargs, p; 2827 unsigned int nargs, p;
2778 int n, ndef; 2828 int n, ndef;
2779 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2780 2830
2781 nargs = 0; 2831 nargs = 0;
… …
2787 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2788 priv = ch; 2838 priv = ch;
2789 ch = cmd_getc (); 2839 ch = cmd_getc ();
2790 } 2840 }
2791 2841
2842 prev_ch = 0;
2792 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2793 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2794 { 2845 {
2795 if (isdigit (ch)) 2846 if (isdigit (ch))
2796 { 2847 {
… …
2806 n = -1; 2857 n = -1;
2807 } 2858 }
2808 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2809 process_nonprinting (ch); 2860 process_nonprinting (ch);
2810 2861
2862 prev_ch = ch;
2811 ch = cmd_getc (); 2863 ch = cmd_getc ();
2812 } 2864 }
2813 2865
2814 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2815 return; 2867 return;
… …
2885 } 2937 }
2886 break; 2938 break;
2887#endif 2939#endif
2888 2940
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2948 break;
2897 2949
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3049 scr_insert_mode (1); 3101 scr_insert_mode (1);
3050 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3052 break; 3104 break;
3053 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3054 /* 3111 /*
3055 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3056 */ 3113 */
3057 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3058 if (nargs == 1) 3115 if (nargs == 1)
… …
3132 break; 3189 break;
3133 3190
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3192 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3139 break; 3196 break;
3140 3197
3141 /* 3198 /*
3142 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
… …
3191rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3192{ 3249{
3193 unicode_t ch; 3250 unicode_t ch;
3194 bool seen_esc = false; 3251 bool seen_esc = false;
3195 unsigned int n = 0; 3252 unsigned int n = 0;
3196 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3197 3254
3198 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3199 { 3256 {
3200 if (seen_esc) 3257 if (seen_esc)
3201 { 3258 {
… …
3216 else if (ch < 0x20) 3273 else if (ch < 0x20)
3217 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3218 3275
3219 seen_esc = false; 3276 seen_esc = false;
3220 3277
3221 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3222 // stop at some sane length 3279 // stop at some sane length
3223 return NULL; 3280 return NULL;
3224 3281
3225 string[n++] = ch; 3282 string[n++] = ch;
3226 } 3283 }
… …
3343 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3401 && actual_type != None
3345 && actual_format == 8) 3402 && actual_format == 8)
3346 str = (const char *)(value); 3403 str = (const char *)(value);
3347 3404
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3349 3406
3350 XFree (value); 3407 XFree (value);
3351 } 3408 }
3352 else 3409 else
3353 { 3410 {
… …
3421 break; 3478 break;
3422#endif 3479#endif
3423 case URxvt_Color_border: 3480 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3425 break; 3482 break;
3426#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3427 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3429 { 3487 {
3430 bool changed = false; 3488 bool changed = false;
3431 3489
3432 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434 3492
3435 if (changed) 3493 if (changed)
3436 update_background (); 3494 update_background ();
3437 } 3495 }
3438 3496
… …
3442#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3445 { 3503 {
3446 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3447 3509
3448 sprintf (str, "[%dx%d+%d+%d]", 3510 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767), 3511 h_scale, v_scale,
3450 min (h_align, 32767), min (v_align, 32767)); 3512 h_align, v_align);
3451 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 } 3514 }
3453 else 3515 else
3454 { 3516 {
3455 bool changed = false; 3517 bool changed = false;
3456 3518
3457 if (*str != ';') 3519 if (*str != ';')
3458 { 3520 {
3459 if (bg_set_file (str)) /* change pixmap */ 3521 try
3522 {
3523 fimage.set_file_geometry (this, str);
3460 changed = true; 3524 changed = true;
3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3461 } 3529 }
3462 else 3530 else
3463 { 3531 {
3464 str++; 3532 str++;
3465 if (bg_set_geometry (str, true)) 3533 if (fimage.set_geometry (str, true))
3466 changed = true; 3534 changed = true;
3467 } 3535 }
3468 3536
3469 if (changed) 3537 if (changed)
3470 { 3538 {
3471 if (bg_window_position_sensitive ()) 3539 if (bg_window_position_sensitive ())
3472 { 3540 {
3473 int x, y; 3541 int x, y;
3474 get_window_origin (x, y); 3542 get_window_origin (x, y);
3475 bg_set_position (x, y); 3543 parent_x = x;
3544 parent_y = y;
3476 } 3545 }
3477 update_background (); 3546 update_background ();
3478 } 3547 }
3479 } 3548 }
3480 break; 3549 break;
… …
3570 * 's' = save 3639 * 's' = save
3571 * 'r' = restore 3640 * 'r' = restore
3572 * 't' = toggle 3641 * 't' = toggle
3573 * so no need for fancy checking 3642 * so no need for fancy checking
3574 */ 3643 */
3575int 3644int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3646{
3578 int state; 3647 int state;
3579 3648
3580 if (mode == 's') 3649 if (mode == 's')
3581 { 3650 {
3582 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3583 return -1; 3655 return -1;
3584 } 3656 }
3585 else 3657 else
3586 { 3658 {
3587 if (mode == 'r') 3659 if (mode == 'r')
… …
3797 } 3869 }
3798} 3870}
3799/*}}} */ 3871/*}}} */
3800 3872
3801/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3802void 3874void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3876{
3805 unsigned int i; 3877 unsigned int i;
3806 short rendset; 3878 short rendset;
3807 int rendstyle; 3879 int rendstyle;
… …
3948 break; 4020 break;
3949#endif 4021#endif
3950 } 4022 }
3951 } 4023 }
3952} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3953/*}}} */ 4041/*}}} */
3954 4042
3955/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
3956 4047
3957/* 4048/*
3958 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
3960 */ 4051 */
… …
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4060 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
3971} 4062}
3972 4063
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4065void
3976 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
3978 4080
3979void 4081void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4083{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4085 return;
3984 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
3985 if (pty->pty < 0) 4095 if (pty->pty < 0)
3986 return; 4096 return;
3987 4097
3988 if (v_buflen == 0) 4098 if (v_buflen == 0)
3989 { 4099 {

Diff Legend

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