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.503 by sf-exg, Mon Dec 5 13:36:56 2011 UTC vs.
Revision 1.564 by sf-exg, Fri Mar 27 15:06:09 2015 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
325 }; 324 };
326 325
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 336# endif
338#endif 337#endif
339 return keysym; 338 return keysym;
340} 339}
341 340
342static inline int 341static inline int ecb_cold
343map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
344{ 343{
345 int param = 0; 344 int param = 0;
346 345
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 371 param = 3;
373 break; 372 break;
374 case XK_Select: 373 case XK_Select:
375 param = 4; 374 param = 4;
376 break; 375 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 376 case XK_Prior:
379 param = 5; 377 param = 5;
380 break; 378 break;
381 case XK_Next: 379 case XK_Next:
382 param = 6; 380 param = 6;
… …
385 param = 7; 383 param = 7;
386 break; 384 break;
387 case XK_End: 385 case XK_End:
388 param = 8; 386 param = 8;
389 break; 387 break;
390#endif
391 case XK_Help: 388 case XK_Help:
392 param = 28; 389 param = 28;
393 break; 390 break;
394 case XK_Menu: 391 case XK_Menu:
395 param = 29; 392 param = 29;
396 break; 393 break;
397 } 394 }
398 return param; 395 return param;
399} 396}
400 397
401void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
403{ 409{
404 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
405 KeySym keysym; 411 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
408 414
409#if ISO_14755 415#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
411 return; 417 return;
412#endif 418#endif
… …
421 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
423 429
424 kbuf[0] = 0; 430 kbuf[0] = 0;
425 431
426#ifdef USE_XIM 432#if USE_XIM
427 if (Input_Context) 433 if (Input_Context)
428 { 434 {
429 Status status_return; 435 Status status_return;
430 436
431#if 0 437#if 0
… …
469 } 475 }
470 } 476 }
471 else 477 else
472 len = 0; 478 len = 0;
473 } 479 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 480 }
478 else 481 else
479#endif 482#endif
480 { 483 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
483 } 488 {
489 KeySym orig_keysym = keysym;
484 490
485 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
486 { 704 {
487#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 707 return;
490#endif 708#endif
491 709
492 if (saveLines) 710 if (saveLines)
493 { 711 {
… …
506#endif 724#endif
507 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
508 726
509 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
510 { 728 {
511 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
512 return; 730 return;
513 } 731 }
514 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
515 { 733 {
516 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
517 return; 735 return;
518 } 736 }
519 } 737 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
522 { 740 {
523 if (keysym == XK_Up) 741 if (keysym == XK_Up)
524 { 742 {
525 scr_page (UP, 1); 743 scr_page (1);
526 return; 744 return;
527 } 745 }
528 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
529 { 747 {
530 scr_page (DN, 1); 748 scr_page (-1);
531 return; 749 return;
532 } 750 }
533 } 751 }
534#endif 752#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
537 { 755 {
538 if (keysym == XK_Home) 756 if (keysym == XK_Home)
539 { 757 {
540 scr_move_to (0, 1); 758 scr_changeview (top_row);
541 return; 759 return;
542 } 760 }
543 else if (keysym == XK_End) 761 else if (keysym == XK_End)
544 { 762 {
545 scr_move_to (1, 1); 763 scr_changeview (0);
546 return; 764 return;
547 } 765 }
548 } 766 }
549#endif 767#endif
550 } 768 }
551 769
552 if (shft) 770 if (shft)
553 { 771 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 773 {
562 switch (keysym) 774 switch (keysym)
563 { 775 {
564 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 785 return;
574#endif 786#endif
575 } 787 }
576 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
577 } 804 }
578 805
579#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 807 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 863 {
637 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
638 return; 865 return;
639 } 866 }
640#endif 867#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 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 ();
… …
1016 flush (); 1032 flush ();
1017} 1033}
1018 1034
1019#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1020void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1022{ 1056{
1023 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1024 want_refresh = 1; 1058 want_refresh = 1;
1025 refresh_check (); 1059 refresh_check ();
… …
1058 1092
1059#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1060void 1094void
1061rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1062{ 1096{
1063 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1064 { 1098 {
1065 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1066 want_refresh = 1; 1100 want_refresh = 1;
1067 refresh_check (); 1101 refresh_check ();
1068 } 1102 }
… …
1073 1107
1074#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1075void 1109void
1076rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1077{ 1111{
1078 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1079 { 1113 {
1080 want_refresh = 1; 1114 want_refresh = 1;
1081 refresh_check (); 1115 refresh_check ();
1082 } 1116 }
1083 1117
… …
1204 pty_write (); 1238 pty_write ();
1205 1239
1206 refresh_check (); 1240 refresh_check ();
1207} 1241}
1208 1242
1209void 1243void ecb_cold
1210rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1211{ 1245{
1212 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1213 recolour_cursor (); 1247 recolor_cursor ();
1214 1248
1215#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1216 hidden_pointer = 0; 1250 hidden_pointer = 0;
1217 1251
1218 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1219 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1220#endif 1254#endif
1221} 1255}
1222 1256
1223#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1224void 1258void ecb_cold
1225rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1226{ 1260{
1227 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1228 return; 1262 return;
1229 1263
… …
1231 XFlush (dpy); 1265 XFlush (dpy);
1232 1266
1233 hidden_pointer = 1; 1267 hidden_pointer = 1;
1234} 1268}
1235 1269
1236void 1270void ecb_cold
1237rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1238{ 1272{
1239 make_current (); 1273 make_current ();
1240 1274
1241 pointer_blank (); 1275 pointer_blank ();
… …
1333 32 + x, 1367 32 + x,
1334 32 + y); 1368 32 + y);
1335} 1369}
1336 1370
1337/*{{{ process an X event */ 1371/*{{{ process an X event */
1338void 1372void ecb_hot
1339rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1340{ 1374{
1341 make_current (); 1375 make_current ();
1342 1376
1343 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1446 if (ev.xconfigure.window == parent) 1480 if (ev.xconfigure.window == parent)
1447 { 1481 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1483 ;
1450 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1451#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1454 { 1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1455 int x, y; 1499 int x, y;
1500
1456 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1457 { 1502 {
1458 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1460 } 1505 }
1461 else 1506 else
1462 get_window_origin (x, y); 1507 get_window_origin (x, y);
1463 1508
1464 if (bg_set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1465 || !(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));
1466 moved = true; 1514 moved = true;
1515 }
1467 } 1516 }
1468#endif
1469 1517
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1519 {
1472 seen_resize = 1; 1520 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1496 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1497 break; 1545 break;
1498 1546
1499 case MapNotify: 1547 case MapNotify:
1500#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1501 /* 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
1502 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1504 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1505 * reparenting. 1553 // events at startup when the window manager reparents the
1506 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1508 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1509 * bit of time for ConfigureNotifies to arrive.
1510 * We should render background PRIOR to drawing any text, but AFTER all
1511 * of ConfigureNotifys for the best results.
1512 */
1513 if (!(bg_flags & BG_IS_VALID))
1514 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1515#endif 1558#endif
1516 mapped = 1; 1559 mapped = 1;
1517#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1518 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1610 1653
1611#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1612 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1613 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1614 { 1657 {
1658 page_dirn scroll_selection_dir;
1615 int dist; 1659 int dist;
1616 1660
1617 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1618 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1619 */ 1663 */
… …
1634 dist = int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1635 } 1679 }
1636 else 1680 else
1637 { 1681 {
1638 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1639 dist = ev.xbutton.y - (int_bwidth + height); 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1640 } 1684 }
1641 1685
1642 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1643 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1644 + 1; 1688 + 1;
1645 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1646 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1647 } 1692 }
1648 else 1693 else
1649 { 1694 {
1650 /* we are within the text window, so we 1695 /* we are within the text window, so we
1651 * shouldn't be scrolling 1696 * shouldn't be scrolling
… …
1676 } 1721 }
1677 break; 1722 break;
1678 } 1723 }
1679 1724
1680#if defined(CURSOR_BLINK) 1725#if defined(CURSOR_BLINK)
1681 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1726 if (ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.again (); 1727 cursor_blink_reset ();
1690 }
1691#endif 1728#endif
1692 1729
1693#if defined(POINTER_BLANK) 1730#if defined(POINTER_BLANK)
1694 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1731 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1732 {
… …
1706 1743
1707 refresh_check (); 1744 refresh_check ();
1708} 1745}
1709 1746
1710#if ENABLE_FRILLS 1747#if ENABLE_FRILLS
1711void 1748void ecb_cold
1712rxvt_term::set_urgency (bool enable) 1749rxvt_term::set_urgency (bool enable)
1713{ 1750{
1714 if (enable == urgency_hint) 1751 if (enable == urgency_hint)
1715 return; 1752 return;
1716 1753
… …
1722 XFree (h); 1759 XFree (h);
1723 } 1760 }
1724} 1761}
1725#endif 1762#endif
1726 1763
1727void 1764void ecb_cold
1728rxvt_term::focus_in () 1765rxvt_term::focus_in ()
1729{ 1766{
1730 if (!focus) 1767 if (!focus)
1731 { 1768 {
1732 focus = 1; 1769 focus = 1;
… …
1745#endif 1782#endif
1746#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
1748 { 1785 {
1749 pix_colors = pix_colors_focused; 1786 pix_colors = pix_colors_focused;
1750 scr_recolour (); 1787 scr_recolor ();
1751 } 1788 }
1752#endif 1789#endif
1753#if ENABLE_FRILLS 1790#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell)) 1791 if (option (Opt_urgentOnBell))
1755 set_urgency (0); 1792 set_urgency (0);
… …
1757 1794
1758 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 } 1796 }
1760} 1797}
1761 1798
1762void 1799void ecb_cold
1763rxvt_term::focus_out () 1800rxvt_term::focus_out ()
1764{ 1801{
1765 if (focus) 1802 if (focus)
1766 { 1803 {
1767 focus = 0; 1804 focus = 0;
… …
1792#endif 1829#endif
1793#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1795 { 1832 {
1796 pix_colors = pix_colors_unfocused; 1833 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1834 scr_recolor ();
1798 } 1835 }
1799#endif 1836#endif
1800 1837
1801 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1838 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1802 } 1839 }
1803} 1840}
1804 1841
1805void 1842void ecb_cold
1806rxvt_term::update_fade_color (unsigned int idx) 1843rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1807{ 1844{
1808#if OFF_FOCUS_FADING 1845#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1846 if (rs[Rs_fade])
1810 { 1847 {
1848 if (!first_time)
1849 pix_colors_focused [idx].free (this);
1850
1811 rgba c; 1851 rgba c;
1812 pix_colors [Color_fade].get (c); 1852 pix_colors [Color_fade].get (c);
1813 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1853 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1814 } 1854 }
1815#endif 1855#endif
1816} 1856}
1817 1857
1818#if ENABLE_TRANSPARENCY || ENABLE_PERL 1858#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1819void 1859void ecb_hot
1820rxvt_term::rootwin_cb (XEvent &ev) 1860rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1861{
1822 make_current (); 1862 make_current ();
1823 1863
1824 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1864 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1825 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1865 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1826 return; 1866 return;
1827 1867
1828# if ENABLE_TRANSPARENCY
1829 switch (ev.type) 1868 switch (ev.type)
1830 { 1869 {
1831 case PropertyNotify: 1870 case PropertyNotify:
1832 /* 1871 /*
1833 * if user used some Esetroot compatible prog to set the root bg, 1872 * if user used some Esetroot compatible prog to set the root bg,
1834 * use the property to determine the pixmap. We use it later on. 1873 * use the property to determine the pixmap. We use it later on.
1835 */ 1874 */
1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1875 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1876 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1838 { 1877 {
1839 bg_set_root_pixmap (); 1878#if BG_IMAGE_FROM_ROOT
1879 if (option (Opt_transparent))
1880 {
1881 rxvt_img::new_from_root (this)->replace (root_img);
1840 update_background (); 1882 update_background ();
1883 }
1884#endif
1885 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1841 } 1886 }
1842 1887
1843 break; 1888 break;
1844 } 1889 }
1845# endif
1846 1890
1847 refresh_check (); 1891 refresh_check ();
1848} 1892}
1849#endif 1893#endif
1850 1894
… …
1873 iso14755_54 (ev.x, ev.y); 1917 iso14755_54 (ev.x, ev.y);
1874 return; 1918 return;
1875 } 1919 }
1876#endif 1920#endif
1877 1921
1878 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1922 clickintime = ev.time - MEvent.time < multiClickTime;
1879 1923
1880 if (reportmode) 1924 if (reportmode)
1881 { 1925 {
1882 /* mouse report from vt window */ 1926 /* mouse report from vt window */
1883 /* save the xbutton state (for ButtonRelease) */ 1927 /* save the xbutton state (for ButtonRelease) */
… …
2133#ifdef MOUSE_REPORT_DOUBLECLICK 2177#ifdef MOUSE_REPORT_DOUBLECLICK
2134 /* only report the release of 'slow' single clicks */ 2178 /* only report the release of 'slow' single clicks */
2135 if (MEvent.button != AnyButton 2179 if (MEvent.button != AnyButton
2136 && (ev.button != MEvent.button 2180 && (ev.button != MEvent.button
2137 || (ev.time - MEvent.time 2181 || (ev.time - MEvent.time
2138 > MULTICLICK_TIME / 2))) 2182 > multiClickTime / 2)))
2139 { 2183 {
2140 MEvent.clicks = 0; 2184 MEvent.clicks = 0;
2141 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2142 mouse_report (ev); 2186 mouse_report (ev);
2143 } 2187 }
… …
2163 case Button3: 2207 case Button3:
2164 selection_make (ev.time); 2208 selection_make (ev.time);
2165 break; 2209 break;
2166 2210
2167 case Button2: 2211 case Button2:
2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2212 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2213 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2214 break;
2171 2215
2172#ifdef MOUSE_WHEEL 2216#ifdef MOUSE_WHEEL
2173 case Button4: 2217 case Button4:
2174 case Button5: 2218 case Button5:
2175 { 2219 {
2176 int i; 2220 int lines;
2177 page_dirn v; 2221 page_dirn dirn;
2178 2222
2179 v = ev.button == Button4 ? UP : DN; 2223 dirn = ev.button == Button4 ? UP : DN;
2180 2224
2181 if (ev.state & ShiftMask) 2225 if (ev.state & ShiftMask)
2182 i = 1; 2226 lines = 1;
2183 else if (option (Opt_mouseWheelScrollPage)) 2227 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2228 lines = nrow - 1;
2185 else 2229 else
2186 i = 5; 2230 lines = 5;
2187 2231
2188# ifdef MOUSE_SLIP_WHEELING 2232# ifdef MOUSE_SLIP_WHEELING
2189 if (ev.state & ControlMask) 2233 if (ev.state & ControlMask)
2190 { 2234 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2235 mouse_slip_wheel_speed += dirn;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2236 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2237
2195 if (!slip_wheel_ev.is_active ()) 2238 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2239 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197 } 2240 }
2198 else 2241 else
2199# endif 2242# endif
2200 { 2243 {
2201 scr_page (v, i); 2244 scr_page (dirn, lines);
2202 scrollBar.show (1); 2245 scrollBar.show (1);
2203 } 2246 }
2204 } 2247 }
2205 break; 2248 break;
2206#endif 2249#endif
… …
2208 } 2251 }
2209} 2252}
2210 2253
2211/*}}} */ 2254/*}}} */
2212 2255
2213void 2256void ecb_hot
2214rxvt_term::cmd_parse () 2257rxvt_term::cmd_parse ()
2215{ 2258{
2216 wchar_t ch = NOCHAR; 2259 wchar_t ch = NOCHAR;
2217 char *seq_begin; // remember start of esc-sequence here 2260 char *seq_begin; // remember start of esc-sequence here
2218 2261
… …
2337 } 2380 }
2338 } 2381 }
2339} 2382}
2340 2383
2341// read the next character 2384// read the next character
2342wchar_t 2385wchar_t ecb_hot
2343rxvt_term::next_char () NOTHROW 2386rxvt_term::next_char () NOTHROW
2344{ 2387{
2345 while (cmdbuf_ptr < cmdbuf_endp) 2388 while (cmdbuf_ptr < cmdbuf_endp)
2346 { 2389 {
2347 // assume 7-bit to be ascii ALWAYS 2390 // assume 7-bit to be ascii ALWAYS
… …
2359 } 2402 }
2360 2403
2361 if (len == (size_t)-1) 2404 if (len == (size_t)-1)
2362 { 2405 {
2363 mbstate.reset (); // reset now undefined conversion state 2406 mbstate.reset (); // reset now undefined conversion state
2407 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2408 // in which case we "erroneously" return the next byte which might be valid.
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2409 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365 } 2410 }
2366 2411
2367 // assume wchar == unicode 2412 // assume wchar == unicode
2368 cmdbuf_ptr += len; 2413 cmdbuf_ptr += len;
… …
2371 2416
2372 return NOCHAR; 2417 return NOCHAR;
2373} 2418}
2374 2419
2375// read the next octet 2420// read the next octet
2376uint32_t 2421uint32_t ecb_hot
2377rxvt_term::next_octet () NOTHROW 2422rxvt_term::next_octet () NOTHROW
2378{ 2423{
2379 return cmdbuf_ptr < cmdbuf_endp 2424 return cmdbuf_ptr < cmdbuf_endp
2380 ? (unsigned char)*cmdbuf_ptr++ 2425 ? (unsigned char)*cmdbuf_ptr++
2381 : NOCHAR; 2426 : NOCHAR;
2382} 2427}
2383 2428
2384static class out_of_input out_of_input; 2429static class out_of_input out_of_input;
2385 2430
2386wchar_t 2431wchar_t ecb_hot
2387rxvt_term::cmd_getc () THROW ((class out_of_input)) 2432rxvt_term::cmd_getc () THROW ((class out_of_input))
2388{ 2433{
2389 wchar_t c = next_char (); 2434 wchar_t c = next_char ();
2390 2435
2391 if (c == NOCHAR) 2436 if (c == NOCHAR)
2392 throw out_of_input; 2437 throw out_of_input;
2393 2438
2394 return c; 2439 return c;
2395} 2440}
2396 2441
2397uint32_t 2442uint32_t ecb_hot
2398rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2443rxvt_term::cmd_get8 () THROW ((class out_of_input))
2399{ 2444{
2400 uint32_t c = next_octet (); 2445 uint32_t c = next_octet ();
2401 2446
2402 if (c == NOCHAR) 2447 if (c == NOCHAR)
… …
2406} 2451}
2407 2452
2408/*{{{ print pipe */ 2453/*{{{ print pipe */
2409/*----------------------------------------------------------------------*/ 2454/*----------------------------------------------------------------------*/
2410#ifdef PRINTPIPE 2455#ifdef PRINTPIPE
2411FILE * 2456FILE * ecb_cold
2412rxvt_term::popen_printer () 2457rxvt_term::popen_printer ()
2413{ 2458{
2414 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2459 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2415 2460
2416 if (stream == NULL) 2461 if (stream == NULL)
2417 rxvt_warn ("can't open printer pipe, not printing.\n"); 2462 rxvt_warn ("can't open printer pipe, not printing.\n");
2418 2463
2419 return stream; 2464 return stream;
2420} 2465}
2421 2466
2422int 2467int ecb_cold
2423rxvt_term::pclose_printer (FILE *stream) 2468rxvt_term::pclose_printer (FILE *stream)
2424{ 2469{
2425 fflush (stream); 2470 fflush (stream);
2426 return pclose (stream); 2471 return pclose (stream);
2427} 2472}
2428 2473
2429/* 2474/*
2430 * simulate attached vt100 printer 2475 * simulate attached vt100 printer
2431 */ 2476 */
2432void 2477void ecb_cold
2433rxvt_term::process_print_pipe () 2478rxvt_term::process_print_pipe ()
2434{ 2479{
2435 FILE *fd = popen_printer (); 2480 FILE *fd = popen_printer ();
2436 2481
2437 if (!fd) 2482 if (!fd)
… …
2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2537 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2538 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2494}; 2539};
2495 2540
2496/*{{{ process non-printing single characters */ 2541/*{{{ process non-printing single characters */
2497void 2542void ecb_hot
2498rxvt_term::process_nonprinting (unicode_t ch) 2543rxvt_term::process_nonprinting (unicode_t ch)
2499{ 2544{
2500 switch (ch) 2545 switch (ch)
2501 { 2546 {
2502 case C0_ESC: 2547 case C0_ESC:
… …
2532 scr_charset_choose (0); 2577 scr_charset_choose (0);
2533 break; 2578 break;
2534 2579
2535#ifdef EIGHT_BIT_CONTROLS 2580#ifdef EIGHT_BIT_CONTROLS
2536 // 8-bit controls 2581 // 8-bit controls
2537 case 0x90: /* DCS */ 2582 case 0x90: /* DCS */
2538 process_dcs_seq (); 2583 process_dcs_seq ();
2539 break; 2584 break;
2540 case 0x9b: /* CSI */ 2585 case 0x9b: /* CSI */
2541 process_csi_seq (); 2586 process_csi_seq ();
2542 break; 2587 break;
2543 case 0x9d: /* OSC */ 2588 case 0x9d: /* OSC */
2544 process_osc_seq (); 2589 process_osc_seq ();
2545 break; 2590 break;
2546#endif 2591#endif
2547 } 2592 }
2548} 2593}
2549/*}}} */ 2594/*}}} */
2550 2595
2551 2596
2552/*{{{ process VT52 escape sequences */ 2597/*{{{ process VT52 escape sequences */
2553void 2598void ecb_cold
2554rxvt_term::process_escape_vt52 (unicode_t ch) 2599rxvt_term::process_escape_vt52 (unicode_t ch)
2555{ 2600{
2556 int row, col; 2601 int row, col;
2557 2602
2558 switch (ch) 2603 switch (ch)
… …
2608} 2653}
2609/*}}} */ 2654/*}}} */
2610 2655
2611 2656
2612/*{{{ process escape sequences */ 2657/*{{{ process escape sequences */
2613void 2658void ecb_hot
2614rxvt_term::process_escape_seq () 2659rxvt_term::process_escape_seq ()
2615{ 2660{
2616 unicode_t ch = cmd_getc (); 2661 unicode_t ch = cmd_getc ();
2617 2662
2618 if (priv_modes & PrivMode_vt52) 2663 if (priv_modes & PrivMode_vt52)
… …
2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2815 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2817 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773 }; 2818 };
2774 2819
2775void 2820void ecb_hot
2776rxvt_term::process_csi_seq () 2821rxvt_term::process_csi_seq ()
2777{ 2822{
2778 unicode_t ch, priv, i; 2823 unicode_t ch, priv, prev_ch, i;
2779 unsigned int nargs, p; 2824 unsigned int nargs, p;
2780 int n, ndef; 2825 int n, ndef;
2781 int arg[ESC_ARGS] = { }; 2826 int arg[ESC_ARGS] = { };
2782 2827
2783 nargs = 0; 2828 nargs = 0;
… …
2789 /* '<' '=' '>' '?' '!' */ 2834 /* '<' '=' '>' '?' '!' */
2790 priv = ch; 2835 priv = ch;
2791 ch = cmd_getc (); 2836 ch = cmd_getc ();
2792 } 2837 }
2793 2838
2839 prev_ch = 0;
2794 /* read any numerical arguments */ 2840 /* read any numerical arguments */
2795 for (n = -1; ch < CSI_ICH; ) 2841 for (n = -1; ch < CSI_ICH; )
2796 { 2842 {
2797 if (isdigit (ch)) 2843 if (isdigit (ch))
2798 { 2844 {
… …
2808 n = -1; 2854 n = -1;
2809 } 2855 }
2810 else if (IS_CONTROL (ch)) 2856 else if (IS_CONTROL (ch))
2811 process_nonprinting (ch); 2857 process_nonprinting (ch);
2812 2858
2859 prev_ch = ch;
2813 ch = cmd_getc (); 2860 ch = cmd_getc ();
2814 } 2861 }
2815 2862
2816 if (ch > CSI_7F) 2863 if (ch > CSI_7F)
2817 return; 2864 return;
… …
3051 scr_insert_mode (1); 3098 scr_insert_mode (1);
3052 else if (arg[0] == 20) 3099 else if (arg[0] == 20)
3053 priv_modes |= PrivMode_LFNL; 3100 priv_modes |= PrivMode_LFNL;
3054 break; 3101 break;
3055 3102
3103 case CSI_71: // DECSCUSR: set cursor style
3104 if (prev_ch == ' ')
3105 set_cursor_style (arg[0]);
3106 break;
3107
3056 /* 3108 /*
3057 * PRIVATE USE beyond this point. All CSI_7? sequences here 3109 * PRIVATE USE beyond this point. All CSI_7? sequences here
3058 */ 3110 */
3059 case CSI_72: /* DECSTBM: set top and bottom margins */ 3111 case CSI_72: /* DECSTBM: set top and bottom margins */
3060 if (nargs == 1) 3112 if (nargs == 1)
… …
3134 break; 3186 break;
3135 3187
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3188 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3189 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3190 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3191 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3192 (unsigned int) (args[1] * fheight));
3141 break; 3193 break;
3142 3194
3143 /* 3195 /*
3144 * reports - some output format copied from XTerm 3196 * reports - some output format copied from XTerm
… …
3193rxvt_term::get_to_st (unicode_t &ends_how) 3245rxvt_term::get_to_st (unicode_t &ends_how)
3194{ 3246{
3195 unicode_t ch; 3247 unicode_t ch;
3196 bool seen_esc = false; 3248 bool seen_esc = false;
3197 unsigned int n = 0; 3249 unsigned int n = 0;
3198 wchar_t string[STRING_MAX]; 3250 wchar_t string[CBUFSIZ];
3199 3251
3200 while ((ch = cmd_getc ()) != NOCHAR) 3252 while ((ch = cmd_getc ()) != NOCHAR)
3201 { 3253 {
3202 if (seen_esc) 3254 if (seen_esc)
3203 { 3255 {
… …
3218 else if (ch < 0x20) 3270 else if (ch < 0x20)
3219 return NULL; /* other control character - exit */ 3271 return NULL; /* other control character - exit */
3220 3272
3221 seen_esc = false; 3273 seen_esc = false;
3222 3274
3223 if (n >= STRING_MAX - 1) 3275 if (n >= sizeof (string) - 1)
3224 // stop at some sane length 3276 // stop at some sane length
3225 return NULL; 3277 return NULL;
3226 3278
3227 string[n++] = ch; 3279 string[n++] = ch;
3228 } 3280 }
… …
3345 &nitems, &bytes_after, &value) == Success 3397 &nitems, &bytes_after, &value) == Success
3346 && actual_type != None 3398 && actual_type != None
3347 && actual_format == 8) 3399 && actual_format == 8)
3348 str = (const char *)(value); 3400 str = (const char *)(value);
3349 3401
3350 tt_printf ("\033]%d;%s%c", op, str, resp); 3402 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3351 3403
3352 XFree (value); 3404 XFree (value);
3353 } 3405 }
3354 else 3406 else
3355 { 3407 {
… …
3423 break; 3475 break;
3424#endif 3476#endif
3425 case URxvt_Color_border: 3477 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp); 3478 process_color_seq (op, Color_border, str, resp);
3427 break; 3479 break;
3428#if ENABLE_TRANSPARENCY 3480
3481#if BG_IMAGE_FROM_ROOT
3429 case URxvt_Color_tint: 3482 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp); 3483 process_color_seq (op, Color_tint, str, resp);
3431 { 3484 {
3432 bool changed = false; 3485 bool changed = false;
3433 3486
3434 if (ISSET_PIXCOLOR (Color_tint)) 3487 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3488 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436 3489
3437 if (changed) 3490 if (changed)
3438 update_background (); 3491 update_background ();
3439 } 3492 }
3440 3493
… …
3444#if BG_IMAGE_FROM_FILE 3497#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap: 3498 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?")) 3499 if (!strcmp (str, "?"))
3447 { 3500 {
3448 char str[256]; 3501 char str[256];
3502 int h_scale = fimage.h_scale;
3503 int v_scale = fimage.v_scale;
3504 int h_align = fimage.h_align;
3505 int v_align = fimage.v_align;
3449 3506
3450 sprintf (str, "[%dx%d+%d+%d]", 3507 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767), 3508 h_scale, v_scale,
3452 min (h_align, 32767), min (v_align, 32767)); 3509 h_align, v_align);
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3510 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3511 }
3455 else 3512 else
3456 { 3513 {
3457 bool changed = false; 3514 bool changed = false;
3458 3515
3459 if (*str != ';') 3516 if (*str != ';')
3460 { 3517 {
3461 if (bg_set_file (str)) /* change pixmap */ 3518 try
3519 {
3520 fimage.set_file_geometry (this, str);
3462 changed = true; 3521 changed = true;
3522 }
3523 catch (const class rxvt_failure_exception &e)
3524 {
3525 }
3463 } 3526 }
3464 else 3527 else
3465 { 3528 {
3466 str++; 3529 str++;
3467 if (bg_set_geometry (str, true)) 3530 if (fimage.set_geometry (str, true))
3468 changed = true; 3531 changed = true;
3469 } 3532 }
3470 3533
3471 if (changed) 3534 if (changed)
3472 { 3535 {
3473 if (bg_window_position_sensitive ()) 3536 if (bg_window_position_sensitive ())
3474 { 3537 {
3475 int x, y; 3538 int x, y;
3476 get_window_origin (x, y); 3539 get_window_origin (x, y);
3477 bg_set_position (x, y); 3540 parent_x = x;
3541 parent_y = y;
3478 } 3542 }
3479 update_background (); 3543 update_background ();
3480 } 3544 }
3481 } 3545 }
3482 break; 3546 break;
… …
3572 * 's' = save 3636 * 's' = save
3573 * 'r' = restore 3637 * 'r' = restore
3574 * 't' = toggle 3638 * 't' = toggle
3575 * so no need for fancy checking 3639 * so no need for fancy checking
3576 */ 3640 */
3577int 3641int ecb_cold
3578rxvt_term::privcases (int mode, unsigned long bit) 3642rxvt_term::privcases (int mode, unsigned long bit)
3579{ 3643{
3580 int state; 3644 int state;
3581 3645
3582 if (mode == 's') 3646 if (mode == 's')
3583 { 3647 {
3584 SavedModes |= (priv_modes & bit); 3648 if (priv_modes & bit)
3649 SavedModes |= bit;
3650 else
3651 SavedModes &= ~bit;
3585 return -1; 3652 return -1;
3586 } 3653 }
3587 else 3654 else
3588 { 3655 {
3589 if (mode == 'r') 3656 if (mode == 'r')
… …
3619 { 5, PrivMode_rVideo }, // DECSCNM 3686 { 5, PrivMode_rVideo }, // DECSCNM
3620 { 6, PrivMode_relOrigin }, // DECOM 3687 { 6, PrivMode_relOrigin }, // DECOM
3621 { 7, PrivMode_Autowrap }, // DECAWM 3688 { 7, PrivMode_Autowrap }, // DECAWM
3622 // 8, auto-repeat keys // DECARM 3689 // 8, auto-repeat keys // DECARM
3623 { 9, PrivMode_MouseX10 }, 3690 { 9, PrivMode_MouseX10 },
3691 { 12, PrivMode_BlinkingCursor },
3624 // 18 end FF to printer after print screen 3692 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region 3693 // 19 Print screen prints full screen/scroll region
3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3694 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3627#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3628 { scrollBar_esc, PrivMode_scrollBar }, 3696 { scrollBar_esc, PrivMode_scrollBar },
… …
3737 scrollBar.map (state); 3805 scrollBar.map (state);
3738 resize_all_windows (0, 0, 0); 3806 resize_all_windows (0, 0, 0);
3739 scr_touch (true); 3807 scr_touch (true);
3740 break; 3808 break;
3741#endif 3809#endif
3810#ifdef CURSOR_BLINK
3811 case 12:
3812 cursor_blink_reset ();
3813 break;
3814#endif
3742 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3743 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3744 break; 3817 break;
3745 /* case 35: - shift keys */ 3818 /* case 35: - shift keys */
3746 /* case 40: - 80 <--> 132 mode */ 3819 /* case 40: - 80 <--> 132 mode */
… …
3799 } 3872 }
3800} 3873}
3801/*}}} */ 3874/*}}} */
3802 3875
3803/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3804void 3877void ecb_hot
3805rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3806{ 3879{
3807 unsigned int i; 3880 unsigned int i;
3808 short rendset; 3881 short rendset;
3809 int rendstyle; 3882 int rendstyle;
… …
3851 //case 19: // ninth alt font 3924 //case 19: // ninth alt font
3852 //case 20: // gothic 3925 //case 20: // gothic
3853 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3854 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3855 break; 3928 break;
3856 case 22: // normal intensity 3929 case 22: // bold off (vt220)
3857 rendset = 0, rendstyle = RS_Bold; 3930 rendset = 0, rendstyle = RS_Bold;
3858 break; 3931 break;
3859 case 23: // disable italic 3932 case 23: // disable italic
3860 rendset = 0, rendstyle = RS_Italic; 3933 rendset = 0, rendstyle = RS_Italic;
3861 break; 3934 break;
3862 case 24: 3935 case 24: // underline off (vt220)
3863 rendset = 0, rendstyle = RS_Uline; 3936 rendset = 0, rendstyle = RS_Uline;
3864 break; 3937 break;
3865 case 25: 3938 case 25: // blink off (vt220)
3866 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3867 break; 3940 break;
3868 case 26: // variable spacing (iso 8613) 3941 case 26: // variable spacing (iso 8613)
3869 rendset = 0, rendstyle = RS_Blink; 3942 rendset = 0, rendstyle = RS_Blink;
3870 break; 3943 break;
3871 case 27: 3944 case 27: // reverse off (vt220)
3872 rendset = 0, rendstyle = RS_RVid; 3945 rendset = 0, rendstyle = RS_RVid;
3873 break; 3946 break;
3874 //case 28: // visible. NYI 3947 //case 28: // visible. NYI
3875 //case 29: // not crossed-out 3948 //case 29: // not crossed-out
3876 } 3949 }
… …
3950 break; 4023 break;
3951#endif 4024#endif
3952 } 4025 }
3953 } 4026 }
3954} 4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 6))
4033 return;
4034
4035 if (style == 0)
4036 style = 1;
4037
4038 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, cursor_type == 1);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4047}
3955/*}}} */ 4048/*}}} */
3956 4049
3957/* ------------------------------------------------------------------------- */ 4050/* ---------------------------------------------------------------------- */
4051/* Write data to the pty as typed by the user, pasted with the mouse,
4052 * or generated by us in response to a query ESC sequence.
4053 */
3958 4054
3959/* 4055/*
3960 * Send printf () formatted output to the command. 4056 * Send printf () formatted output to the command.
3961 * Only use for small amounts of data. 4057 * Only use for small amounts of data.
3962 */ 4058 */
… …
3970 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4066 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3971 va_end (arg_ptr); 4067 va_end (arg_ptr);
3972 tt_write (buf, strlen (buf)); 4068 tt_write (buf, strlen (buf));
3973} 4069}
3974 4070
3975/* ---------------------------------------------------------------------- */
3976/* Write data to the pty as typed by the user, pasted with the mouse, 4071/* Write data to the pty as typed by the user. */
3977 * or generated by us in response to a query ESC sequence. 4072void
3978 */ 4073rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4074{
4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4076 return;
4077
4078 if (option (Opt_scrollTtyKeypress))
4079 if (view_start)
4080 {
4081 view_start = 0;
4082 want_refresh = 1;
4083 }
4084
4085 tt_write_ (data, len);
4086}
3980 4087
3981void 4088void
3982rxvt_term::tt_write (const char *data, unsigned int len) 4089rxvt_term::tt_write (const char *data, unsigned int len)
3983{ 4090{
3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4091 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3985 return; 4092 return;
3986 4093
4094 tt_write_ (data, len);
4095}
4096
4097static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4098
4099void
4100rxvt_term::tt_write_ (const char *data, unsigned int len)
4101{
3987 if (pty->pty < 0) 4102 if (pty->pty < 0)
3988 return; 4103 return;
3989 4104
3990 if (v_buflen == 0) 4105 if (v_buflen == 0)
3991 { 4106 {

Diff Legend

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